]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Re-enable the feature that one can set CXXFLAGS before calling ./configure. I had...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 10 Nov 2008 14:55:13 +0000 (14:55 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 10 Nov 2008 14:55:13 +0000 (14:55 +0000)
git-svn-id: https://svn.dealii.org/trunk@17530 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index b9f362c24cb51e2f62212949f4eba73d1be633d9..d0188d75424d44a44b6a5c62277b28a5a9250b85 100644 (file)
@@ -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
index 324efc208b02c311e829e99c1cc4358af260df3f..33b7a60eaa78e8bb42fd7354800977068c715065 100755 (executable)
@@ -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"

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.