From ef542da4ccf1a95704aa7dc582c0eb94f15267b4 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 17 Oct 2008 20:01:55 +0000 Subject: [PATCH] Get the test for Trilinos header files right. git-svn-id: https://svn.dealii.org/trunk@17265 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 65 +++++++++++++++++++++++----------------------- deal.II/configure | 65 +++++++++++++++++++++++----------------------- 2 files changed, 66 insertions(+), 64 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index f0422c1cf0..e02ec9e618 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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 ], [], diff --git a/deal.II/configure b/deal.II/configure index 250984217b..718a06db4d 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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 -- 2.39.5