From 8403c2a84b4c5cf061ca3c434c333503cca8f30d Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 31 Jul 2007 00:25:52 +0000 Subject: [PATCH] fix bug where sometimes an existing installation of flac could interfere with the build process (SF#1763690: https://sourceforge.net/tracker/index.php?func=detail&aid=1763690&group_id=13478&atid=113478) --- configure.in | 12 ++++++------ doc/html/changelog.html | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 3c9aac8..8826f19 100644 --- a/configure.in +++ b/configure.in @@ -274,17 +274,17 @@ AC_DEFINE(FLAC__HAS_GAS) AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler]) fi -OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include' +CPPFLAGS='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'" $CPPFLAGS" if test "x$debug" = xtrue; then - OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -DDEBUG" + CPPFLAGS="-DDEBUG $CPPFLAGS" + CFLAGS="-g $CFLAGS" else - OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG" + CPPFLAGS="-DNDEBUG $CPPFLAGS" if test "x$GCC" = xyes; then - OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__" + CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS" + CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS" fi fi -CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS" -CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS" #@@@ AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no") diff --git a/doc/html/changelog.html b/doc/html/changelog.html index 7fba15e..492ef9f 100644 --- a/doc/html/changelog.html +++ b/doc/html/changelog.html @@ -98,6 +98,7 @@ build system:
  • -- 2.7.4