From: bangerth Date: Fri, 17 Oct 2008 22:18:25 +0000 (+0000) Subject: Fix setting of cppflags. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b003e8724aeebdc50c2156fcbbd3be13474014a;p=dealii-svn.git Fix setting of cppflags. git-svn-id: https://svn.dealii.org/trunk@17267 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index e02ec9e618..df5be0a90a 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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}" ]) diff --git a/deal.II/configure b/deal.II/configure index 718a06db4d..4348c1e48f 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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}"