Fix condition.

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index da1f481f2bea8ae4517b85562fe3be0f3071d86d..2ed26789ca33f116f31f699f08de9565e50bd7b2 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -6544,6 +6544,8 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_LIBS, dnl
       dnl add an assertion.
       if test $DEAL_II_TRILINOS_VERSION_MAJOR = 10 -a \
               $DEAL_II_TRILINOS_VERSION_MINOR -lt 4 ; then
+        :
+      else
         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"

diff --git a/deal.II/configure b/deal.II/configure
index 1364bc8bbbcfb3deec9cbeecec2d0e54982edcc5..efdc939daab450b32a7106514243a66ce3842c53 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -10881,6 +10881,8 @@ $as_echo_n "checking for the set of Trilinos libraries... " >&6; }
     else
                               if test $DEAL_II_TRILINOS_VERSION_MAJOR = 10 -a \
               $DEAL_II_TRILINOS_VERSION_MINOR -lt 4 ; then
+        :
+      else
         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"