From: bangerth Date: Thu, 6 Oct 2011 18:36:03 +0000 (+0000) Subject: Blacklist 10.8.[01]. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dafec6292eaec0dafbbea5afd209159e5e2f7264;p=dealii-svn.git Blacklist 10.8.[01]. git-svn-id: https://svn.dealii.org/trunk@24537 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 2ed26789ca..7fd9c6d0c1 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -6344,9 +6344,17 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS_VERSION, dnl dnl for example dnl https://software.sandia.gov/bugzilla/show_bug.cgi?id=5062 dnl https://software.sandia.gov/bugzilla/show_bug.cgi?id=5319 + dnl The same is unfortunately true for 10.8.[01]: + dnl https://software.sandia.gov/bugzilla/show_bug.cgi?id=5370 if test "$DEAL_II_TRILINOS_VERSION_MAJOR" = 10 -a "$DEAL_II_TRILINOS_VERSION_MINOR" = 6 ; then AC_MSG_ERROR([Trilinos versions 10.6.x have bugs that make it incompatible - with deal.II. Please use versions before or after 10.6.x.]) + with deal.II. Please use versions before 10.6 or after 10.8.1.]) + fi + if test "$DEAL_II_TRILINOS_VERSION_MAJOR" = 10 \ + -a "$DEAL_II_TRILINOS_VERSION_MINOR" = 8 \ + -a "$DEAL_II_TRILINOS_VERSION_SUBMINOR" -lt 2 ; then + AC_MSG_ERROR([Trilinos versions 10.8.0 and 10.8.1 have bugs that make it incompatible + with deal.II. Please use versions before 10.6 or after 10.8.1.]) fi AC_SUBST(DEAL_II_TRILINOS_VERSION_MAJOR) diff --git a/deal.II/configure b/deal.II/configure index efdc939daa..8c792b8eba 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -10707,9 +10707,15 @@ $as_echo "$DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_ as_fn_error $? "Trilinos versions prior to 10.0 are no longer supported with deal.II." "$LINENO" 5 fi - if test "$DEAL_II_TRILINOS_VERSION_MAJOR" = 10 -a "$DEAL_II_TRILINOS_VERSION_MINOR" = 6 ; then + if test "$DEAL_II_TRILINOS_VERSION_MAJOR" = 10 -a "$DEAL_II_TRILINOS_VERSION_MINOR" = 6 ; then as_fn_error $? "Trilinos versions 10.6.x have bugs that make it incompatible - with deal.II. Please use versions before or after 10.6.x." "$LINENO" 5 + with deal.II. Please use versions before 10.6 or after 10.8.1." "$LINENO" 5 + fi + if test "$DEAL_II_TRILINOS_VERSION_MAJOR" = 10 \ + -a "$DEAL_II_TRILINOS_VERSION_MINOR" = 8 \ + -a "$DEAL_II_TRILINOS_VERSION_SUBMINOR" -lt 2 ; then + as_fn_error $? "Trilinos versions 10.8.0 and 10.8.1 have bugs that make it incompatible + with deal.II. Please use versions before 10.6 or after 10.8.1." "$LINENO" 5 fi