]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Get the test for Trilinos header files right.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 17 Oct 2008 20:01:55 +0000 (20:01 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 17 Oct 2008 20:01:55 +0000 (20:01 +0000)
git-svn-id: https://svn.dealii.org/trunk@17265 0785d39b-7218-0410-832d-ea1e28bc413d

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

index f0422c1cf02e4a11e3748c07b66aa404762c43a0..e02ec9e6183f4b0efb06b8664330137bce306a1b 100644 (file)
@@ -5610,39 +5610,40 @@ 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"
-  AC_CHECK_HEADERS([Amesos.h
-                    AztecOO.h
-                    AztecOO_Operator.h
-                    Epetra_CrsGraph.h
-                    Epetra_CrsMatrix.h
-                    Epetra_Import.h
-                    Epetra_LinearProblem.h
-                    Epetra_Map.h
-                    Epetra_MultiVector.h
-                    Epetra_Operator.h
-                    Epetra_SerialComm.h
-                    Epetra_Vector.h
-                    Ifpack.h
-                    ml_MultiLevelPreconditioner.h
-                    Sacado.hpp
-                    Teuchos_ParameterList.hpp
-                    Teuchos_RCP.hpp
-                    Teuchos_RefCountPtr.hpp
-                    Thyra_AztecOOLinearOpWithSolveFactory.hpp
-                    Thyra_DefaultBlockedLinearOpDecl.hpp
-                    Thyra_DefaultBlockedLinearOp.hpp
-                    Thyra_DefaultInverseLinearOp.hpp
-                    Thyra_EpetraLinearOp.hpp
-                    Thyra_EpetraThyraWrappers.hpp
-                    Thyra_InverseLinearOperator.hpp
-                    Thyra_LinearOperatorDecl.hpp
-                    Thyra_LinearOperatorImpl.hpp
-                    Thyra_LinearOpWithSolveFactoryHelpers.hpp
-                    Thyra_MultiVectorBase.hpp
-                    Thyra_MultiVectorDefaultBase.hpp
-                    Thyra_VectorDecl.hpp
-                    Thyra_VectorImpl.hpp
+  AC_CHECK_HEADERS([Amesos.h \
+                    AztecOO.h \
+                    AztecOO_Operator.h \
+                    Epetra_CrsGraph.h \
+                    Epetra_CrsMatrix.h \
+                    Epetra_Import.h \
+                    Epetra_LinearProblem.h \
+                    Epetra_Map.h \
+                    Epetra_MultiVector.h \
+                    Epetra_Operator.h \
+                    Epetra_SerialComm.h \
+                    Epetra_Vector.h \
+                    Ifpack.h \
+                    ml_MultiLevelPreconditioner.h \
+                    Sacado.hpp \
+                    Teuchos_ParameterList.hpp \
+                    Teuchos_RCP.hpp \
+                    Teuchos_RefCountPtr.hpp \
+                    Thyra_AztecOOLinearOpWithSolveFactory.hpp \
+                    Thyra_DefaultBlockedLinearOpDecl.hpp \
+                    Thyra_DefaultBlockedLinearOp.hpp \
+                    Thyra_DefaultInverseLinearOp.hpp \
+                    Thyra_EpetraLinearOp.hpp \
+                    Thyra_EpetraThyraWrappers.hpp \
+                    Thyra_InverseLinearOperator.hpp \
+                    Thyra_LinearOperatorDecl.hpp \
+                    Thyra_LinearOperatorImpl.hpp \
+                    Thyra_LinearOpWithSolveFactoryHelpers.hpp \
+                    Thyra_MultiVectorBase.hpp \
+                    Thyra_MultiVectorDefaultBase.hpp \
+                    Thyra_VectorDecl.hpp \
+                    Thyra_VectorImpl.hpp \
                     Thyra_VectorSpaceImpl.hpp
                    ],
                    [],
index 250984217b0079feaed8e76cab9094e47d5e2d9d..718a06db4d2ee26fbca619c254cab5cfea015126 100755 (executable)
@@ -12389,6 +12389,7 @@ 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"
 
 
@@ -12423,38 +12424,38 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
-for ac_header in Amesos.h
-                    AztecOO.h
-                    AztecOO_Operator.h
-                    Epetra_CrsGraph.h
-                    Epetra_CrsMatrix.h
-                    Epetra_Import.h
-                    Epetra_LinearProblem.h
-                    Epetra_Map.h
-                    Epetra_MultiVector.h
-                    Epetra_Operator.h
-                    Epetra_SerialComm.h
-                    Epetra_Vector.h
-                    Ifpack.h
-                    ml_MultiLevelPreconditioner.h
-                    Sacado.hpp
-                    Teuchos_ParameterList.hpp
-                    Teuchos_RCP.hpp
-                    Teuchos_RefCountPtr.hpp
-                    Thyra_AztecOOLinearOpWithSolveFactory.hpp
-                    Thyra_DefaultBlockedLinearOpDecl.hpp
-                    Thyra_DefaultBlockedLinearOp.hpp
-                    Thyra_DefaultInverseLinearOp.hpp
-                    Thyra_EpetraLinearOp.hpp
-                    Thyra_EpetraThyraWrappers.hpp
-                    Thyra_InverseLinearOperator.hpp
-                    Thyra_LinearOperatorDecl.hpp
-                    Thyra_LinearOperatorImpl.hpp
-                    Thyra_LinearOpWithSolveFactoryHelpers.hpp
-                    Thyra_MultiVectorBase.hpp
-                    Thyra_MultiVectorDefaultBase.hpp
-                    Thyra_VectorDecl.hpp
-                    Thyra_VectorImpl.hpp
+for ac_header in Amesos.h \
+                    AztecOO.h \
+                    AztecOO_Operator.h \
+                    Epetra_CrsGraph.h \
+                    Epetra_CrsMatrix.h \
+                    Epetra_Import.h \
+                    Epetra_LinearProblem.h \
+                    Epetra_Map.h \
+                    Epetra_MultiVector.h \
+                    Epetra_Operator.h \
+                    Epetra_SerialComm.h \
+                    Epetra_Vector.h \
+                    Ifpack.h \
+                    ml_MultiLevelPreconditioner.h \
+                    Sacado.hpp \
+                    Teuchos_ParameterList.hpp \
+                    Teuchos_RCP.hpp \
+                    Teuchos_RefCountPtr.hpp \
+                    Thyra_AztecOOLinearOpWithSolveFactory.hpp \
+                    Thyra_DefaultBlockedLinearOpDecl.hpp \
+                    Thyra_DefaultBlockedLinearOp.hpp \
+                    Thyra_DefaultInverseLinearOp.hpp \
+                    Thyra_EpetraLinearOp.hpp \
+                    Thyra_EpetraThyraWrappers.hpp \
+                    Thyra_InverseLinearOperator.hpp \
+                    Thyra_LinearOperatorDecl.hpp \
+                    Thyra_LinearOperatorImpl.hpp \
+                    Thyra_LinearOpWithSolveFactoryHelpers.hpp \
+                    Thyra_MultiVectorBase.hpp \
+                    Thyra_MultiVectorDefaultBase.hpp \
+                    Thyra_VectorDecl.hpp \
+                    Thyra_VectorImpl.hpp \
                     Thyra_VectorSpaceImpl.hpp
 
 do

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.