From f6fdc50f2d1a93d3c11eeb5592ad5a6564d22845 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 13 Dec 2010 12:32:33 +0000 Subject: [PATCH] Prepending ./configure generated options to CFLAGS rather than appending them --- libisoburn/trunk/configure.ac | 12 ++++++------ libisoburn/trunk/xorriso/configure_ac.txt | 10 +++++----- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index da52abcf..45e0cf90 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -333,18 +333,18 @@ AC_ARG_ENABLE(debug, , enable_debug=yes) if test x$enable_debug != xyes; then if test x$GCC = xyes; then - CFLAGS="$CFLAGS -O3" - CFLAGS="$CFLAGS -fexpensive-optimizations" + CFLAGS="-O3 $CFLAGS" + CFLAGS="-fexpensive-optimizations $CFLAGS" fi - CFLAGS="$CFLAGS -DNDEBUG" + CFLAGS="-DNDEBUG $CFLAGS" else if test x$GCC = xyes; then - CFLAGS="$CFLAGS -g -pedantic -Wall" + CFLAGS="-g -pedantic -Wall $CFLAGS" fi - CFLAGS="$CFLAGS -DDEBUG" + CFLAGS="-DDEBUG $CFLAGS" fi -CFLAGS="$CFLAGS $READLINE_DEF $LIBACL_DEF $XATTR_DEF $EXTF_DEF $EXTF_SUID_DEF $ZLIB_DEF $LIBJTE_DEF $XORRISO_DVD_OBS_64K" +CFLAGS="$READLINE_DEF $LIBACL_DEF $XATTR_DEF $EXTF_DEF $EXTF_SUID_DEF $ZLIB_DEF $LIBJTE_DEF $XORRISO_DVD_OBS_64K $CFLAGS" AC_CONFIG_FILES([ Makefile diff --git a/libisoburn/trunk/xorriso/configure_ac.txt b/libisoburn/trunk/xorriso/configure_ac.txt index 5f6928c1..e2c33816 100644 --- a/libisoburn/trunk/xorriso/configure_ac.txt +++ b/libisoburn/trunk/xorriso/configure_ac.txt @@ -130,15 +130,15 @@ AC_ARG_ENABLE(debug, , enable_debug=yes) if test x$enable_debug != xyes; then if test x$GCC = xyes; then - CFLAGS="$CFLAGS -O3" - CFLAGS="$CFLAGS -fexpensive-optimizations" + CFLAGS="-O3 $CFLAGS" + CFLAGS="-fexpensive-optimizations $CFLAGS" fi - CFLAGS="$CFLAGS -DNDEBUG" + CFLAGS="-DNDEBUG $CFLAGS" else if test x$GCC = xyes; then - CFLAGS="$CFLAGS -g -pedantic -Wall" + CFLAGS="-g -pedantic -Wall $CFLAGS" fi - CFLAGS="$CFLAGS -DDEBUG" + CFLAGS="-DDEBUG $CFLAGS" fi diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index d749463e..072cee46 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.12.12.120823" +#define Xorriso_timestamP "2010.12.13.123226"