Add an assertion.

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 33d14289153d816df6c33f00f4b3a372f4eed80b..da1f481f2bea8ae4517b85562fe3be0f3071d86d 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -6538,7 +6538,14 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_LIBS, dnl
       DEAL_II_TRILINOS_LIBS="`grep Trilinos_LIBRARIES $DEAL_II_TRILINOS_INCDIR/TrilinosConfig.cmake \
         | perl -pi -e 's/.*\"(.*)\".*/\1/g; s/;/ /g;'`"
     else
-      dnl Fall back to the fixed list
+      dnl Fall back to the fixed list. This should only be necessary
+      dnl for Trilinos versions before 10.4. If, for a later version,
+      dnl this happens, we don't want to fall back to this list, so
+      dnl add an assertion.
+      if test $DEAL_II_TRILINOS_VERSION_MAJOR = 10 -a \
+              $DEAL_II_TRILINOS_VERSION_MINOR -lt 4 ; then
+        AC_MSG_ERROR([package file TrilinosConfig.cmake not found])
+      fi
       DEAL_II_TRILINOS_LIBS="stratimikosamesos stratimikosaztecoo stratimikosifpack stratimikosml stratimikos ml amesos belos ifpack aztecoo rtop sacado thyra thyraepetra thyraepetraext epetraext epetra teuchos triutils"
     fi
   fi

diff --git a/deal.II/configure b/deal.II/configure
index 705789881e7e827372d5dfeca56d366513e1b752..1364bc8bbbcfb3deec9cbeecec2d0e54982edcc5 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -10879,7 +10879,11 @@ $as_echo_n "checking for the set of Trilinos libraries... " >&6; }
             DEAL_II_TRILINOS_LIBS="`grep Trilinos_LIBRARIES $DEAL_II_TRILINOS_INCDIR/TrilinosConfig.cmake \
         | perl -pi -e 's/.*\"(.*)\".*/\1/g; s/;/ /g;'`"
     else
-            DEAL_II_TRILINOS_LIBS="stratimikosamesos stratimikosaztecoo stratimikosifpack stratimikosml stratimikos ml amesos belos ifpack aztecoo rtop sacado thyra thyraepetra thyraepetraext epetraext epetra teuchos triutils"
+                              if test $DEAL_II_TRILINOS_VERSION_MAJOR = 10 -a \
+              $DEAL_II_TRILINOS_VERSION_MINOR -lt 4 ; then
+        as_fn_error $? "package file TrilinosConfig.cmake not found" "$LINENO" 5
+      fi
+      DEAL_II_TRILINOS_LIBS="stratimikosamesos stratimikosaztecoo stratimikosifpack stratimikosml stratimikos ml amesos belos ifpack aztecoo rtop sacado thyra thyraepetra thyraepetraext epetraext epetra teuchos triutils"
     fi
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_LIBS" >&5