tests for blas, umfpack and lapack libraries handle --without correctly

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 1f690dd048485935308fce8620ac7dd9c1de23cb..d82a856fe1645ec0f402b7a9d23739ed4dd678b5 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -5249,14 +5249,14 @@ dnl Include the LAPACK library
 dnl --------------------------------------------------
 AC_DEFUN(DEAL_II_WITH_LAPACK, dnl
 [
-  if test "x$1" != "xyes" ; then
-    AC_CHECK_LIB($1, dgbsv_,
-    [ LIBS="-l$1 $LIBS"
-      AC_DEFINE(HAVE_LIBLAPACK)
-    ])
-dnl    fi
-  else
-    AC_CHECK_LIB(lapack, dgbsv_)
+  if test "x$1" != "xno" ; then
+    if test "x$1" != "xyes" ; then lapack="$1"; else lapack="lapack"; fi
+    AC_CHECK_LIB($lapack, dgbsv_,
+      [ LIBS="-l$lapack $LIBS"
+        AC_DEFINE(HAVE_LIBLAPACK)
+      ],
+      [AC_MSG_ERROR([LAPACK library $lapack not found])]
+    )
   fi
 ])
 
@@ -5283,14 +5283,16 @@ dnl Include the BLAS library
 dnl --------------------------------------------------
 AC_DEFUN(DEAL_II_WITH_BLAS, dnl
 [
-  if test "x$1" != "xyes" ; then blas="$1"; else blas="blas"; fi
-  AC_CHECK_LIB($blas, daxpy_,
-               [ 
-                 LIBS="-l$blas $LIBS"
-                 AC_DEFINE(HAVE_LIBBLAS)
-               ],
-               [ABORT_BLAS_ON_ERROR($blas)],$F77LIBS)
-  AC_SUBST(NEEDS_F77LIBS, "yes")
+  if test "x$1" != "xno" ; then
+    if test "x$1" != "xyes" ; then blas="$1"; else blas="blas"; fi
+    AC_CHECK_LIB($blas, daxpy_,
+                 [ 
+                   LIBS="-l$blas $LIBS"
+                   AC_DEFINE(HAVE_LIBBLAS)
+                 ],
+                 [ABORT_BLAS_ON_ERROR($blas)],$F77LIBS)
+    AC_SUBST(NEEDS_F77LIBS, "yes")
+  fi
 ])
 
 dnl --------------------------------------------------

diff --git a/deal.II/configure b/deal.II/configure
index 33567dafa9b9c0a66d1f5cc43505bdf9207b1a8d..aa27274f63e287542f873624ba906cd81261b386 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -11066,13 +11066,13 @@ echo "${ECHO_T}$DEAL_II_PETSC_MPIUNI_LIB" >&6
 
 
 if test "x$with_umfpack" != "x" -a "x$with_umfpack" != "xno" ; then
-  if test "x$with_blas" = "x" ; then
+  if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
     with_blas="yes"
   fi
 fi
 
 if test "x$with_lapack" != "x" -a "x$with_lapack" != "xno" ; then
-  if test "x$with_blas" = "x" ; then
+  if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
     with_blas="yes"
   fi
 fi
@@ -11080,7 +11080,7 @@ fi
 
 if test "x$with_petsc" != "x" -a "x$with_petsc" != "xno" ; then
   if test "x$enableshared" = "xno" ; then
-    if test "x$with_blas" = "x" ; then
+    if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
       with_blas="yes"
     fi
   fi
@@ -11092,8 +11092,9 @@ fi
 if test "${with_blas+set}" = set; then
   withval="$with_blas"
 
-  if test "x$withval" != "xyes" ; then blas="$withval"; else blas="blas"; fi
-  as_ac_Lib=`echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh`
+  if test "x$withval" != "xno" ; then
+    if test "x$withval" != "xyes" ; then blas="$withval"; else blas="blas"; fi
+    as_ac_Lib=`echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for daxpy_ in -l$blas" >&5
 echo $ECHO_N "checking for daxpy_ in -l$blas... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
@@ -11160,8 +11161,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
 
-                 LIBS="-l$blas $LIBS"
-                 cat >>confdefs.h <<\_ACEOF
+                   LIBS="-l$blas $LIBS"
+                   cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBBLAS 1
 _ACEOF
 
@@ -11194,8 +11195,9 @@ echo "$as_me: error: Configuring BLAS library failed although it was requested.
 
 fi
 
-  NEEDS_F77LIBS="yes"
+    NEEDS_F77LIBS="yes"
 
+  fi
 
 fi;
 
@@ -12048,15 +12050,16 @@ fi;
 if test "${with_lapack+set}" = set; then
   withval="$with_lapack"
 
-  if test "x$withval" != "xyes" ; then
-    as_ac_Lib=`echo "ac_cv_lib_$withval''_dgbsv_" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for dgbsv_ in -l$withval" >&5
-echo $ECHO_N "checking for dgbsv_ in -l$withval... $ECHO_C" >&6
+  if test "x$withval" != "xno" ; then
+    if test "x$withval" != "xyes" ; then lapack="$withval"; else lapack="lapack"; fi
+    as_ac_Lib=`echo "ac_cv_lib_$lapack''_dgbsv_" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for dgbsv_ in -l$lapack" >&5
+echo $ECHO_N "checking for dgbsv_ in -l$lapack... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$withval  $LIBS"
+LIBS="-l$lapack  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12115,86 +12118,16 @@ fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-   LIBS="-l$withval $LIBS"
-      cat >>confdefs.h <<\_ACEOF
+   LIBS="-l$lapack $LIBS"
+        cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBLAPACK 1
 _ACEOF
 
 
-fi
-
-  else
-
-echo "$as_me:$LINENO: checking for dgbsv_ in -llapack" >&5
-echo $ECHO_N "checking for dgbsv_ in -llapack... $ECHO_C" >&6
-if test "${ac_cv_lib_lapack_dgbsv_+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llapack  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dgbsv_ ();
-int
-main ()
-{
-dgbsv_ ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"
-                        || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-        { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_lapack_dgbsv_=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_lapack_dgbsv_=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_lapack_dgbsv_" >&5
-echo "${ECHO_T}$ac_cv_lib_lapack_dgbsv_" >&6
-if test $ac_cv_lib_lapack_dgbsv_ = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLAPACK 1
-_ACEOF
-
-  LIBS="-llapack $LIBS"
+  { { echo "$as_me:$LINENO: error: LAPACK library $lapack not found" >&5
+echo "$as_me: error: LAPACK library $lapack not found" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 

diff --git a/deal.II/configure.in b/deal.II/configure.in
index c3c1d3e9d4b193d14145714cc2f9c709953e995b..1608754c5509611471844645c699bfc7e5b15c7b 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -414,13 +414,13 @@ dnl Make sure we configure for libraries used by other libraries. For
 dnl example, UMFPACK needs blas, and so does LAPACK
 
 if test "x$with_umfpack" != "x" -a "x$with_umfpack" != "xno" ; then
-  if test "x$with_blas" = "x" ; then
+  if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
     with_blas="yes"
   fi
 fi
 
 if test "x$with_lapack" != "x" -a "x$with_lapack" != "xno" ; then
-  if test "x$with_blas" = "x" ; then
+  if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
     with_blas="yes"
   fi
 fi
@@ -431,7 +431,7 @@ dnl linker line (if we use shared libs, then the PETSc libs already carry this
 dnl dependence, but static archives do not have a method to list dependencies)
 if test "x$with_petsc" != "x" -a "x$with_petsc" != "xno" ; then
   if test "x$enableshared" = "xno" ; then
-    if test "x$with_blas" = "x" ; then
+    if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
       with_blas="yes"
     fi
   fi