From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Wed, 1 Sep 2010 13:44:50 +0000 (+0000)
Subject: Regenerate.
X-Git-Tag: v8.0.0~5601
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a1bdfa9a932b0eff5c6f4d20989e572b50db52a;p=dealii.git

Regenerate.

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

diff --git a/deal.II/configure b/deal.II/configure
index c9f3a3e786..1129b7cf38 100755
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 21786 .
+# From configure.in Revision: 21820 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for deal.II 6.4.pre.
 #
@@ -10312,6 +10312,82 @@ $as_echo "$DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_
 
 
 
+  if test "x$USE_CONTRIB_TRILINOS" = "xyes" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for consistency of Trilinos and deal.II MPI settings" >&5
+$as_echo_n "checking for consistency of Trilinos and deal.II MPI settings... " >&6; }
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+    CXXFLAGS="$CXXFLAGSG $INCLUDE -I$DEAL_II_TRILINOS_INCDIR"
+
+    if test "x$DEAL_II_USE_MPI" = "xyes" ; then
+                              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #include <Epetra_config.h>
+
+int
+main ()
+{
+
+	  #ifndef HAVE_MPI
+	    compile error;
+	  #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+      	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+          as_fn_error "Trilinos was not built for MPI, but deal.II is!" "$LINENO" 5
+          exit 1;
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    else
+                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+	  #include <Epetra_config.h>
+
+int
+main ()
+{
+
+	  #ifdef HAVE_MPI
+	    compile error;
+	  #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+	  as_fn_error "Trilinos was built for MPI, but deal.II is not!" "$LINENO" 5
+          exit 1;
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+  fi
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Trilinos uses shared libraries" >&5
 $as_echo_n "checking whether Trilinos uses shared libraries... " >&6; }
@@ -12298,78 +12374,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
-  if test "x$USE_CONTRIB_TRILINOS" = "xyes" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for consistency of Trilinos and deal.II MPI settings" >&5
-$as_echo_n "checking for consistency of Trilinos and deal.II MPI settings... " >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-    CXXFLAGS="$CXXFLAGSG $INCLUDE -I$DEAL_II_TRILINOS_INCDIR"
-
-    if test "x$DEAL_II_USE_MPI" = "xyes" ; then
-                                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-          #include <Epetra_MpiComm.h>
-
-int
-main ()
-{
-
-	     MPI_Init (0,0);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-      	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-else
-
-          as_fn_error "Trilinos was not built for MPI, but deal.II is!" "$LINENO" 5
-          exit 1;
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    else
-                                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-          #include <Epetra_MpiComm.h>
-
-int
-main ()
-{
-
-	     MPI_Init (0,0);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-          as_fn_error "Trilinos was built for MPI, but deal.II is not!" "$LINENO" 5
-          exit 1;
-
-else
-
-      	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-  fi
-
-