Patch by Matrin Kronbichler: Make things work with Trilinos 9 again.

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 117b7b891d6bb5d7c5170f605e3b01e1d4d80596..d6d46bed8ea072b0135646d04fc41d09919df182 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -6153,6 +6153,21 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_MPI_CONSISTENCY, dnl
   OLD_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS -I$DEAL_II_TRILINOS_INCDIR"
 
+  dnl Trilinos Epetra's Epetra_config.h might provide
+  dnl   #define PACKAGE_BUGREPORT
+  dnl   #define PACKAGE_NAME
+  dnl   #define PACKAGE_STRING
+  dnl   #define PACKAGE_TARNAME
+  dnl   #define PACKAGE_VERSION
+  dnl which is already set for the deal.II package. So undefine them for
+  dnl this test.
+  cp confdefs.h confdefs.h.bak
+  echo "#undef PACKAGE_BUGREPORT" >> confdefs.h
+  echo "#undef PACKAGE_NAME" >> confdefs.h
+  echo "#undef PACKAGE_STRING" >> confdefs.h
+  echo "#undef PACKAGE_TARNAME" >> confdefs.h
+  echo "#undef PACKAGE_VERSION" >> confdefs.h
+
   if test "x$DEAL_II_USE_MPI" = "xyes" ; then
     dnl So we support MPI. Check that our Trilinos installation
     dnl does too. Epetra sets the variable HAVE_MPI to 1 in case
@@ -6194,6 +6209,8 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_MPI_CONSISTENCY, dnl
        exit 1;
       ])
   fi
+
+  mv confdefs.h.bak confdefs.h
   CXXFLAGS="${OLD_CXXFLAGS}"
 ])
 

diff --git a/deal.II/configure b/deal.II/configure
index d83c19a6837b2f705a4bd0985abd8cfec80ead2a..d2c69b58b533787233ccbba6a056e4db075480fa 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 22494 .
+# From configure.in Revision: 22611 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.63 for deal.II 6.4.pre.
 #
@@ -1542,8 +1542,9 @@ Optional Packages:
                           Specify the path to the BLACS installation; use this
                           if you want to override the BLACS_DIR environment
                           variable.
- --with-p4est=/path/to/p4est makes deal.II use p4est to distribute meshes
-                     on a cluster computer
+  --with-p4est=/path/to/p4est
+                          Specify the path to the p4est installation; use this
+                          to distribute meshes on a cluster computer.
   --with-blas=blaslib     Use the blas library blaslib. Make sure the path
                           to the libary is searched by ld, since it is
                          included by the argument -lblaslib. If no argument
@@ -13850,6 +13851,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   OLD_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS -I$DEAL_II_TRILINOS_INCDIR"
 
+                  cp confdefs.h confdefs.h.bak
+  echo "#undef PACKAGE_BUGREPORT" >> confdefs.h
+  echo "#undef PACKAGE_NAME" >> confdefs.h
+  echo "#undef PACKAGE_STRING" >> confdefs.h
+  echo "#undef PACKAGE_TARNAME" >> confdefs.h
+  echo "#undef PACKAGE_VERSION" >> confdefs.h
+
   if test "x$DEAL_II_USE_MPI" = "xyes" ; then
                     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13965,6 +13973,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
+
+  mv confdefs.h.bak confdefs.h
   CXXFLAGS="${OLD_CXXFLAGS}"
 
 
@@ -14581,8 +14591,8 @@ _ACEOF
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether p4est shall be used" >&5
-$as_echo_n "checking whether p4est shall be used... " >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether p4est will be used" >&5
+$as_echo_n "checking whether p4est will be used... " >&6; }
 
 
 # Check whether --with-p4est was given.
@@ -17593,7 +17603,9 @@ done
 
 
 
-for ac_func in dgetrs_ sgetrs_ dstev_ sstev_ dsygv_ ssygv_
+
+
+for ac_func in dgetrs_ sgetrs_ dstev_ sstev_ dsygv_ ssygv_ dgelsd_ sgelsd_
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5