Trilinos requires blas and lapack.

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

diff --git a/deal.II/configure b/deal.II/configure
index b9f62a4ac62247b7bff4f5c9718d3431abc0906f..74f8ddffad8231486e819d0638bd83a3f07bfd96 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -11849,6 +11849,22 @@ if test "x$with_petsc" != "x" -a "x$with_petsc" != "xno" ; then
 fi
 
 
+if test "x$with_trilinos" != "x" -a "x$with_trilinos" != "xno" ; then
+  if test "x$enableshared" = "xno" ; then
+    if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
+      with_blas="yes"
+    fi
+    if test "x$with_lapack" = "x" -o "x$with_lapack" = "xno"; then
+      with_lapack="yes"
+    fi
+  fi
+fi
+
+
+
+
+
+
 
 # Check whether --with-blas was given.
 if test "${with_blas+set}" = set; then

diff --git a/deal.II/configure.in b/deal.II/configure.in
index 25f59d8e4064f57577dcbb7549bc6795c08b04ac..3b4438ac37cc935e97887e9464c4dc4ba84b4873 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -455,6 +455,23 @@ if test "x$with_petsc" != "x" -a "x$with_petsc" != "xno" ; then
   esac
 fi
 
+
+dnl The same holds for Trilinos, which needs not only BLAS but also LAPACK
+if test "x$with_trilinos" != "x" -a "x$with_trilinos" != "xno" ; then
+  if test "x$enableshared" = "xno" ; then
+    if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
+      with_blas="yes"
+    fi
+    if test "x$with_lapack" = "x" -o "x$with_lapack" = "xno"; then
+      with_lapack="yes"
+    fi
+  fi
+fi
+
+
+
+
+
 dnl -------------------------------------------------------------
 dnl Actually include libraries here. Check for the libraries
 dnl    requiring FORTRAN support first.