From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 22 Dec 2010 17:03:16 +0000 (+0000)
Subject: fix Trilinos detection: a different #include order produces HAVE_SYS_TIME_H redefinit... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f0d4d3da2e0964e1a947cfe56a234cc3f83bf0;p=dealii-svn.git

fix Trilinos detection: a different #include order produces HAVE_SYS_TIME_H redefinition errors with some MPI version.

git-svn-id: https://svn.dealii.org/trunk@23065 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index b77302717b..ffdee3d44d 100644
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -6435,8 +6435,6 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_HEADER_FILES, dnl
   echo "#endif" >> confdefs.h
 
   AC_CHECK_HEADERS([Amesos.h \
-                    AztecOO.h \
-                    AztecOO_Operator.h \
                     Epetra_CrsGraph.h \
                     Epetra_CrsMatrix.h \
                     Epetra_Import.h \
@@ -6448,6 +6446,8 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_HEADER_FILES, dnl
                     Epetra_Vector.h \
                     Ifpack.h \
                     ml_MultiLevelPreconditioner.h \
+                    AztecOO.h \
+                    AztecOO_Operator.h \
                     Sacado.hpp \
                     Teuchos_ParameterList.hpp \
                     Teuchos_RCP.hpp \