From 26a8fe6cdb32f9fa11e3eff5cef26b56fce6c712 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 10 Nov 2008 14:55:13 +0000 Subject: [PATCH] Re-enable the feature that one can set CXXFLAGS before calling ./configure. I had broken this by accident sometime recently. git-svn-id: https://svn.dealii.org/trunk@17530 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 2 +- deal.II/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b9f362c24c..d0188d7542 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -448,7 +448,7 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl [ dnl In no case do we want to induce BOOST to use deprecated header files - CXXFLAGS="-DBOOST_NO_HASH -DBOOST_NO_SLIST" + CXXFLAGS="$CXXFLAGS -DBOOST_NO_HASH -DBOOST_NO_SLIST" dnl First the flags for gcc compilers if test "$GXX" = yes ; then diff --git a/deal.II/configure b/deal.II/configure index 324efc208b..33b7a60eaa 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -3844,7 +3844,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="-DBOOST_NO_HASH -DBOOST_NO_SLIST" + CXXFLAGS="$CXXFLAGS -DBOOST_NO_HASH -DBOOST_NO_SLIST" if test "$GXX" = yes ; then CXXFLAGSO="$CXXFLAGS -O2 -Wuninitialized -felide-constructors -ftemplate-depth-128" -- 2.39.5