libburnia
/
libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepending ./configure generated options to CFLAGS rather than appending them

This commit is contained in:
Thomas Schmitt 2010-12-13 08:00:00 +00:00
parent 682078575f
commit bf7e4c8027
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2010.12.08.131934" #define Cdrskin_timestamP "2010.12.13.075956"

18
configure.ac
View File

@ -187,7 +187,7 @@ AC_CHECK_HEADER(sys/statvfs.h, X=, STATVFS_DEF=)
AC_CHECK_FUNC([statvfs], X=, STATVFS_DEF=) AC_CHECK_FUNC([statvfs], X=, STATVFS_DEF=)
dnl If this would be done more specifically in Makefile.am dnl If this would be done more specifically in Makefile.am
dnl via libburn_libburn_la_CFLAGS then undesired .o file names would emerge dnl via libburn_libburn_la_CFLAGS then undesired .o file names would emerge
CFLAGS="$CFLAGS $STATVFS_DEF" CFLAGS="$STATVFS_DEF $CFLAGS"
dnl ts A91122 dnl ts A91122
AC_ARG_ENABLE(track-src-odirect, AC_ARG_ENABLE(track-src-odirect,
@ -202,7 +202,7 @@ else
fi fi
dnl Avoid the need for libburn_libburn_la_CFLAGS in Makefile.am (ugly .o names) dnl Avoid the need for libburn_libburn_la_CFLAGS in Makefile.am (ugly .o names)
dnl ### AC_SUBST(LIBBURN_O_DIRECT_DEF) dnl ### AC_SUBST(LIBBURN_O_DIRECT_DEF)
CFLAGS="$CFLAGS $LIBBURN_O_DIRECT_DEF" CFLAGS="$LIBBURN_O_DIRECT_DEF $CFLAGS"
dnl ts A91116 dnl ts A91116
AC_ARG_ENABLE(dvd-obs-64k, AC_ARG_ENABLE(dvd-obs-64k,
@ -215,7 +215,7 @@ else
LIBBURN_DVD_OBS_64K= LIBBURN_DVD_OBS_64K=
echo "disabled write size default 64 KB on DVD and BD" echo "disabled write size default 64 KB on DVD and BD"
fi fi
CFLAGS="$CFLAGS $LIBBURN_DVD_OBS_64K" CFLAGS="$LIBBURN_DVD_OBS_64K $CFLAGS"
dnl ts A91218 dnl ts A91218
AC_ARG_ENABLE(libcdio, AC_ARG_ENABLE(libcdio,
@ -238,7 +238,7 @@ then
fi fi
else else
echo "enabled EXPERIMENTAL use of libcdio as system adapter" echo "enabled EXPERIMENTAL use of libcdio as system adapter"
CFLAGS="$CFLAGS $LIBCDIO_DEF" CFLAGS="$LIBCDIO_DEF $CFLAGS"
LIBCDIO_REQUIRED=0.83 LIBCDIO_REQUIRED=0.83
PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED) PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
@ -286,15 +286,15 @@ AC_ARG_ENABLE(debug,
, enable_debug=yes) , enable_debug=yes)
if test x$enable_debug != xyes; then if test x$enable_debug != xyes; then
if test x$GCC = xyes; then if test x$GCC = xyes; then
CFLAGS="$CFLAGS -O3" CFLAGS="-O3 $CFLAGS"
CFLAGS="$CFLAGS -fexpensive-optimizations" CFLAGS="-fexpensive-optimizations $CFLAGS"
fi fi
CFLAGS="$CFLAGS -DNDEBUG" CFLAGS="-DNDEBUG $CFLAGS"
else else
if test x$GCC = xyes; then if test x$GCC = xyes; then
CFLAGS="$CFLAGS -g -pedantic -Wall" CFLAGS="-g -pedantic -Wall $CFLAGS"
fi fi
CFLAGS="$CFLAGS -DDEBUG" CFLAGS="-DDEBUG $CFLAGS"
fi fi
dnl Determine target directory for libburn-*.pc dnl Determine target directory for libburn-*.pc