]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix setting of cppflags.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 17 Oct 2008 22:18:25 +0000 (22:18 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 17 Oct 2008 22:18:25 +0000 (22:18 +0000)
git-svn-id: https://svn.dealii.org/trunk@17267 0785d39b-7218-0410-832d-ea1e28bc413d

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

index e02ec9e6183f4b0efb06b8664330137bce306a1b..df5be0a90ad0aa865d610088d9934d47d64e7d1a 100644 (file)
@@ -5610,8 +5610,10 @@ dnl ------------------------------------------------------------
 AC_DEFUN(DEAL_II_CHECK_TRILINOS_HEADER_FILES, dnl
 [
   OLD_CXXFLAGS="$CXXFLAGS"
-  CPPFLAGS="-I$DEAL_II_TRILINOS_DIR/include"
-  CXXFLAGS="-I$DEAL_II_TRILINOS_DIR/include"
+  OLD_CPPFLAGS="$CPPFLAGS"
+
+  CPPFLAGS="-I$DEAL_II_TRILINOS_DIR/include $CPPFLAGS"
+  CXXFLAGS="-I$DEAL_II_TRILINOS_DIR/include $CXXFLAGS"
   AC_CHECK_HEADERS([Amesos.h \
                     AztecOO.h \
                     AztecOO_Operator.h \
@@ -5654,6 +5656,7 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_HEADER_FILES, dnl
                                    Trilinos sub-packages enabled.])
                    ],
                    [])
+  CPPFLAGS="${OLD_CPPFLAGS}"
   CXXFLAGS="${OLD_CXXFLAGS}"
 ])
 
index 718a06db4d2ee26fbca619c254cab5cfea015126..4348c1e48fe20e891ebf38239e5523d3187a4589 100755 (executable)
@@ -12389,8 +12389,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   OLD_CXXFLAGS="$CXXFLAGS"
-  CPPFLAGS="-I$DEAL_II_TRILINOS_DIR/include"
-  CXXFLAGS="-I$DEAL_II_TRILINOS_DIR/include"
+  OLD_CPPFLAGS="$CPPFLAGS"
+
+  CPPFLAGS="-I$DEAL_II_TRILINOS_DIR/include $CPPFLAGS"
+  CXXFLAGS="-I$DEAL_II_TRILINOS_DIR/include $CXXFLAGS"
 
 
 
@@ -12613,6 +12615,7 @@ fi
 
 done
 
+  CPPFLAGS="${OLD_CPPFLAGS}"
   CXXFLAGS="${OLD_CXXFLAGS}"
 
 

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.