diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-11-27 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + + Correctly save and restore CXXFLAGS. + 2005-11-18 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyContentPolicy.cpp: diff --git a/configure.ac b/configure.ac index 0526657a4..21a5056d3 100644 --- a/configure.ac +++ b/configure.ac @@ -207,10 +207,10 @@ dnl ********************************** dnl FIXME find a m4/autoconf guru who can distill this into a nice macro AC_LANG_PUSH([C++]) -_SAVE_CFLAGS=$CXXFLAGS -_SAVE_CPPFLAGS=$CPPFLAGS +_SAVE_CXXFLAGS="$CXXFLAGS" +_SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom`" -CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $MOZILLA-xpcom`" +CXXFLAGS="$CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $MOZILLA-xpcom`" dnl Sigh Gentoo has a rubbish header layout dnl http://bugs.gentoo.org/show_bug.cgi?id=100804 |