configure external umfpack

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 9ce5602869210ce1d1f4ea27d6affa35850bb0f2..caebf67946661993c7d1512319e43634f6d3c01d 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -4308,10 +4308,14 @@ dnl What to do if UMFPack is selected
 dnl --------------------------------------------------
 AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
 [
-  AC_MSG_CHECKING(UmfPack library)
   if test "x$1" != "xyes" ; then
-    AC_MSG_RESULT(external version not yet supported)
+    AC_CHECK_FILE($1/Lib/libumfpack.a,
+       UMFPACK_LIB=$1/Lib/libumfpack.a)
+    AC_CHECK_FILE($1/Include/umfpack.h,
+       UMFPACK_INCLUDE_DIR=-I$1/Include,
+       UMFPACK_LIB="")
   else
+    AC_MSG_CHECKING(UmfPack library)
     UMFPACK_LIB='$(LIBDIR)/liblac_umfpack$(lib-suffix)'
     UMFPACK_INCLUDE_DIR='-I$D/contrib/umfpack/UMFPACK/Include'
     USE_CONTRIB_UMFPACK='yes'

diff --git a/deal.II/configure b/deal.II/configure
index 4ba51a18f745da69f4dd6f604195cce7881a2557..f766d5e278b8cb01f1a4b9efd1c3af638c7fd253 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -8901,12 +8901,56 @@ _ACEOF
 if test "${with_umfpack+set}" = set; then
   withval="$with_umfpack"
 
-  echo "$as_me:$LINENO: checking UmfPack library" >&5
-echo $ECHO_N "checking UmfPack library... $ECHO_C" >&6
   if test "x$withval" != "xyes" ; then
-    echo "$as_me:$LINENO: result: external version not yet supported" >&5
-echo "${ECHO_T}external version not yet supported" >&6
+    as_ac_File=`echo "ac_cv_file_$withval/Lib/libumfpack.a" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $withval/Lib/libumfpack.a" >&5
+echo $ECHO_N "checking for $withval/Lib/libumfpack.a... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$withval/Lib/libumfpack.a"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+  UMFPACK_LIB=$withval/Lib/libumfpack.a
+fi
+
+    as_ac_File=`echo "ac_cv_file_$withval/Include/umfpack.h" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $withval/Include/umfpack.h" >&5
+echo $ECHO_N "checking for $withval/Include/umfpack.h... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$withval/Include/umfpack.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+  UMFPACK_INCLUDE_DIR=-I$withval/Include
+else
+  UMFPACK_LIB=""
+fi
+
   else
+    echo "$as_me:$LINENO: checking UmfPack library" >&5
+echo $ECHO_N "checking UmfPack library... $ECHO_C" >&6
     UMFPACK_LIB='$(LIBDIR)/liblac_umfpack$(lib-suffix)'
     UMFPACK_INCLUDE_DIR='-I$D/contrib/umfpack/UMFPACK/Include'
     USE_CONTRIB_UMFPACK='yes'