diff --git a/m4/superlu.m4 b/m4/superlu.m4
index d1a3822a2bbdb9501b2bd1a75040656de0f3828d..43520e27b825f3a0d6a43e9ce86f7998a2d09632 100644
--- a/m4/superlu.m4
+++ b/m4/superlu.m4
@@ -22,23 +22,23 @@
# Whether HEADER was found at all. Either "yes" or "no".
AC_DEFUN([_slu_lib_path],
[
- my_include_path=include/superlu
- my_lib_path=lib
- my_slu_found=yes
- if test ! -f "$1/$my_include_path/$2" ; then
- #Try to find headers under superlu
- my_include_path=include
- if test ! -f "$1/$my_include_path/$2" ; then
- my_include_path=SRC
- if test ! -f "$1/$my_include_path/$2"; then
- my_slu_found=no
- else
- if ! test -d "$1/$my_lib_path"; then
- my_lib_path=""
- fi
- fi
- fi
- fi
+ my_include_path=include/superlu
+ my_lib_path=lib
+ my_slu_found=yes
+ if test ! -f "$1/$my_include_path/$2" ; then
+ #Try to find headers under superlu
+ my_include_path=include
+ if test ! -f "$1/$my_include_path/$2" ; then
+ my_include_path=SRC
+ if test ! -f "$1/$my_include_path/$2"; then
+ my_slu_found=no
+ else
+ if ! test -d "$1/$my_lib_path"; then
+ my_lib_path=""
+ fi
+ fi
+ fi
+ fi
]
)
@@ -60,12 +60,12 @@ AC_DEFUN([_slu_lib_path],
# Whether any of the headers. Either "yes" or "no".
AC_DEFUN([_slu_search_versions],
[
- my_slu_header=slu_ddefs.h
- _slu_lib_path($1, $my_slu_header)
- if test "$my_slu_found" != "yes"; then
- my_slu_header="dsp_defs.h"
- _slu_lib_path($1, $my_slu_header)
- fi
+ my_slu_header=slu_ddefs.h
+ _slu_lib_path($1, $my_slu_header)
+ if test "$my_slu_found" != "yes"; then
+ my_slu_header="dsp_defs.h"
+ _slu_lib_path($1, $my_slu_header)
+ fi
]
)
@@ -81,13 +81,13 @@ AC_DEFUN([_slu_search_versions],
# For other output variables see documentation of _slu_search_versions().
AC_DEFUN([_slu_search_default],
[
- with_superlu=/usr
- _slu_search_versions($with_superlu)
-
- if test "$my_slu_found" = "no"; then
- with_superlu=/usr/local
- _slu_search_versions($with_superlu)
- fi
+ with_superlu=/usr
+ _slu_search_versions($with_superlu)
+
+ if test "$my_slu_found" = "no"; then
+ with_superlu=/usr/local
+ _slu_search_versions($with_superlu)
+ fi
]
)
@@ -145,178 +145,185 @@ AC_DEFUN([_slu_search_default],
# Conditionals:
# SUPERLU
AC_DEFUN([DUNE_PATH_SUPERLU],[
- AC_REQUIRE([AC_PROG_CC])
- #AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
- AC_REQUIRE([ACX_BLAS])
+ AC_REQUIRE([AC_PROG_CC])
+ # we need this for FLIBS
+ AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
+ AC_REQUIRE([ACX_BLAS])
- #
- # User hints ...
- #
- my_lib_path=""
- my_include_path=""
- AC_ARG_WITH([superlu],
- [AC_HELP_STRING([--with-superlu],[user defined path to SuperLU library])],
- [dnl
- if test "$withval" != no ; then
- # get absolute path
- with_superlu=`eval cd $withval 2>&1 && pwd`
- if test "$withval" = yes; then
- # Search in default locations
- _slu_search_default
- else
- # Search for the headers in the specified location
- _slu_search_versions("$with_superlu")
- fi
- fi
- ],
- [dnl
- # Search in default locations
- _slu_search_default
- ])
-
- AC_ARG_WITH([superlu-lib],
- [AC_HELP_STRING([--with-superlu-lib],[The name of the static SuperLU library to link to. By default the shared library with the name superlu-mpi is tried])],
- [
- if test "$withval" = no ; then
- with_superlu_lib=
- fi
- ]
- )
-AC_ARG_WITH([superlu-blaslib],
- [AC_HELP_STRING([--with-superlu-blaslib],[The name of the static blas library to link to. By default the shared library with the name superlu-mpi is tried])],
+ #
+ # User hints ...
+ #
+ my_lib_path=""
+ my_include_path=""
+ AC_ARG_WITH([superlu],
+ [AC_HELP_STRING([--with-superlu],[user defined path to SuperLU library])],
+ [dnl
+ if test x"$withval" != xno ; then
+ # get absolute path
+ with_superlu=`eval cd $withval 2>&1 && pwd`
+ if test x"$withval" = xyes; then
+ # Search in default locations
+ _slu_search_default
+ else
+ # Search for the headers in the specified location
+ _slu_search_versions(["$with_superlu"])
+ fi
+ fi
+ ], [dnl
+ # Search in default locations
+ _slu_search_default
+ ])
+
+ AC_ARG_WITH([superlu-lib],
+ [AC_HELP_STRING([--with-superlu-lib],
+ [The name of the static SuperLU library to link to. By default
+ the static library with the name superlu.a is tried, but
+ only if shared linking has failed first. Giving this
+ options forces static linking for SuperLU.])],
+ [
+ if test x"$withval" = xno ; then
+ with_superlu_lib=
+ fi
+ ])
+
+ AC_ARG_WITH([superlu-blaslib],
+ [AC_HELP_STRING([--with-superlu-blaslib],
+ [The name of the static blas library to link to. By default
+ we try to link to the systems blas library (see
+ --with-blas). Giving this options forces static linking
+ for SuperLU.])],
+ [
+ if test "$withval" = no ; then
+ with_superlu_blaslib=
+ fi
+ ])
+
+ # store old values
+ ac_save_LDFLAGS="$LDFLAGS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ ac_save_LIBS="$LIBS"
+
+ # do nothing if --without-superlu is used
+ if test x"$with_superlu" != x"no" ; then
+ # defaultpath
+ SUPERLU_LIB_PATH="$with_superlu/$my_lib_path"
+ SUPERLU_INCLUDE_PATH="$with_superlu/$my_include_path"
+
+ # set variables so that tests can use them
+ direct_SUPERLU_CPPFLAGS="-I$SUPERLU_INCLUDE_PATH -DENABLE_SUPERLU"
+ SUPERLU_CPPFLAGS="-I$SUPERLU_INCLUDE_PATH -DENABLE_SUPERLU"
+ CPPFLAGS="$CPPFLAGS $direct_SUPERLU_CPPFLAGS"
+
+ # check for central header
+ AC_CHECK_HEADER([$my_slu_header],
+ [HAVE_SUPERLU="1"],
[
- if test "$withval" = no ; then
- with_superlu_blaslib=
- fi
- ]
- )
+ HAVE_SUPERLU="0"
+ AC_MSG_WARN([$my_slu_header not found in $SUPERLU_INCLUDE_PATH with $CPPFLAGS])
+ ])
- # store old values
- ac_save_LDFLAGS="$LDFLAGS"
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_LIBS="$LIBS"
-
- ## do nothing if --without-superlu is used
- if test x"$with_superlu" != x"no" ; then
- # defaultpath
- SUPERLU_LIB_PATH="$with_superlu/$my_lib_path"
- SUPERLU_INCLUDE_PATH="$with_superlu/$my_include_path"
-
-
- # set variables so that tests can use them
- direct_SUPERLU_CPPFLAGS="-I$SUPERLU_INCLUDE_PATH -DENABLE_SUPERLU"
- SUPERLU_CPPFLAGS="-I$SUPERLU_INCLUDE_PATH -DENABLE_SUPERLU"
- CPPFLAGS="$CPPFLAGS $direct_SUPERLU_CPPFLAGS"
-
- # check for central header
- AC_CHECK_HEADER([$my_slu_header],[
- HAVE_SUPERLU="1"],[
- HAVE_SUPERLU="0"
- AC_MSG_WARN([$my_slu_header not found in $SUPERLU_INCLUDE_PATH with $CPPFLAGS])]
- )
-
- # if header is found check for the libs
-
- if test x$HAVE_SUPERLU = x1 ; then
- HAVE_SUPERLU=0
+ # if header is found check for the libs
+ if test x$HAVE_SUPERLU = x1 ; then
+ HAVE_SUPERLU=0
- # if neither --with-superlu-lib nor --with-superlu-blaslib was
- # given, try to link dynamically or with properly names static libs
- if test x"$with_superlu_lib$with_superlu_blaslib" = x; then
- LDFLAGS="$ac_save_LDFLAGS -L$SUPERLU_LIB_PATH"
- LIBS="$ac_save_LIBS"
- AC_CHECK_LIB([superlu], [dgssvx], [
- direct_SUPERLU_LIBS="-L$SUPERLU_LIB_PATH -lsuperlu $BLAS_LIBS $FLIBS"
- SUPERLU_LIBS="-L$SUPERLU_LIB_PATH -lsuperlu \${BLAS_LIBS} \${FLIBS}"
- HAVE_SUPERLU="1"
- ], [], [$BLAS_LIBS $FLIBS])
- fi
+ # if neither --with-superlu-lib nor --with-superlu-blaslib was
+ # given, try to link dynamically or with properly names static libs
+ if test x"$with_superlu_lib$with_superlu_blaslib" = x; then
+ LDFLAGS="$ac_save_LDFLAGS -L$SUPERLU_LIB_PATH"
+ LIBS="$ac_save_LIBS"
+ AC_CHECK_LIB([superlu], [dgssvx],
+ [
+ direct_SUPERLU_LIBS="-L$SUPERLU_LIB_PATH -lsuperlu $BLAS_LIBS $FLIBS"
+ SUPERLU_LIBS="-L$SUPERLU_LIB_PATH -lsuperlu \${BLAS_LIBS} \${FLIBS}"
+ HAVE_SUPERLU="1"
+ ], [], [$BLAS_LIBS $FLIBS])
+ fi
- if test $HAVE_SUPERLU = 0 &&
- test x"$with_superlu_lib" = x; then
- # set the default
- with_superlu_lib=superlu.a
- fi
-
- if test $HAVE_SUPERLU = 0 &&
- test x"$with_superlu_blaslib" = x; then
- # try system blas
- LDFLAGS="$ac_save_LDFLAGS"
- LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $BLAS_LIBS $FLIBS $ac_save_LIBS"
- AC_CHECK_FUNC([dgssvx], [
- direct_SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $BLAS_LIBS $FLIBS"
- SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib \${BLAS_LIBS} \${FLIBS}"
- HAVE_SUPERLU="1"
- ])
- fi
+ if test $HAVE_SUPERLU = 0 && test x"$with_superlu_lib" = x; then
+ # set the default
+ with_superlu_lib=superlu.a
+ fi
- # No default for with_superlu_blaslib
+ if test $HAVE_SUPERLU = 0 &&
+ test x"$with_superlu_blaslib" = x; then
+ # try system blas
+ LDFLAGS="$ac_save_LDFLAGS"
+ LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $BLAS_LIBS $FLIBS $ac_save_LIBS"
+ AC_CHECK_FUNC([dgssvx],
+ [
+ direct_SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $BLAS_LIBS $FLIBS"
+ SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib \${BLAS_LIBS} \${FLIBS}"
+ HAVE_SUPERLU="1"
+ ])
+ fi
- if test $HAVE_SUPERLU = 0 &&
+ # No default for with_superlu_blaslib
+
+ if test $HAVE_SUPERLU = 0 &&
test x"$with_superlu_blaslib" != x; then
- # try internal blas
- LDFLAGS="$ac_save_LDFLAGS"
- LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $SUPERLU_LIB_PATH/$with_superlu_blaslib $FLIBS $ac_save_LIBS"
- AC_CHECK_FUNC([dgssvx], [
- direct_SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $SUPERLU_LIB_PATH/$with_superlu_blaslib $FLIBS"
- SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $SUPERLU_LIB_PATH/$with_superlu_blaslib \${FLIBS}"
- HAVE_SUPERLU="1"
- ])
- fi
- fi
-
- else
- HAVE_SUPERLU=0
+ # try internal blas
+ LDFLAGS="$ac_save_LDFLAGS"
+ LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $SUPERLU_LIB_PATH/$with_superlu_blaslib $FLIBS $ac_save_LIBS"
+ AC_CHECK_FUNC([dgssvx],
+ [
+ direct_SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $SUPERLU_LIB_PATH/$with_superlu_blaslib $FLIBS"
+ SUPERLU_LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $SUPERLU_LIB_PATH/$with_superlu_blaslib \${FLIBS}"
+ HAVE_SUPERLU="1"
+ ])
+ fi
fi
- # Inform the user whether SuperLU was sucessfully found
- AC_MSG_CHECKING([SuperLU])
- if test x$HAVE_SUPERLU = x1 ; then
- if test "$my_slu_header" = "slu_ddefs.h"; then
- with_superlu="yes (post 2005)"
- else
- with_superlu="yes (pre 2005)"
- fi
+ else # $with_superlu = no
+ HAVE_SUPERLU=0
+ fi
+
+ # Inform the user whether SuperLU was sucessfully found
+ AC_MSG_CHECKING([SuperLU])
+ if test x$HAVE_SUPERLU = x1 ; then
+ if test "$my_slu_header" = "slu_ddefs.h"; then
+ with_superlu="yes (post 2005)"
else
- with_superlu="no"
+ with_superlu="yes (pre 2005)"
fi
- AC_MSG_RESULT([$with_superlu])
+ else
+ with_superlu="no"
+ fi
+ AC_MSG_RESULT([$with_superlu])
- # check for optional member
- if test $HAVE_SUPERLU = 1 ; then
- if test "$my_slu_header" = "slu_ddefs.h"; then
- AC_CHECK_MEMBERS([mem_usage_t.expansions],[],[],[#include "slu_ddefs.h"])
- else
- AC_CHECK_MEMBERS([mem_usage_t.expansions],[],[],[#include "dsp_defs.h"])
- fi
+ # check for optional member
+ if test $HAVE_SUPERLU = 1 ; then
+ if test "$my_slu_header" = "slu_ddefs.h"; then
+ AC_CHECK_MEMBERS([mem_usage_t.expansions],[],[],[#include "slu_ddefs.h"])
+ else
+ AC_CHECK_MEMBERS([mem_usage_t.expansions],[],[],[#include "dsp_defs.h"])
fi
+ fi
- # substitute variables
- if test x$HAVE_SUPERLU = x0 ; then
- SUPERLU_LIBS=
- SUPERLU_CPPFLAGS=
- fi
- AC_SUBST([SUPERLU_LIBS])
- AC_SUBST([SUPERLU_CPPFLAGS])
- DUNE_ADD_ALL_PKG([SUPERLU], [\${SUPERLU_CPPFLAGS}], [], [\${SUPERLU_LIBS}])
+ # substitute variables
+ if test x$HAVE_SUPERLU = x0 ; then
+ SUPERLU_LIBS=
+ SUPERLU_CPPFLAGS=
+ fi
+ AC_SUBST([SUPERLU_LIBS])
+ AC_SUBST([SUPERLU_CPPFLAGS])
+ DUNE_ADD_ALL_PKG([SUPERLU], [\${SUPERLU_CPPFLAGS}], [], [\${SUPERLU_LIBS}])
- # tell automake
- AM_CONDITIONAL(SUPERLU, test x$HAVE_SUPERLU = x1)
+ # tell automake
+ AM_CONDITIONAL(SUPERLU, test x$HAVE_SUPERLU = x1)
- # tell the preprocessor
- if test x$HAVE_SUPERLU = x1 ; then
- AC_DEFINE([HAVE_SUPERLU], [ENABLE_SUPERLU], [Define to ENABLE_SUPERLU if SUPERLU is found])
- if test "$my_slu_header" = "slu_ddefs.h"; then
- AC_DEFINE([SUPERLU_POST_2005_VERSION], 1, [define to 1 if there is a header slu_ddefs.h in SuperLU])
- fi
+ # tell the preprocessor
+ if test x$HAVE_SUPERLU = x1 ; then
+ AC_DEFINE([HAVE_SUPERLU], [ENABLE_SUPERLU], [Define to ENABLE_SUPERLU if SUPERLU is found])
+ if test "$my_slu_header" = "slu_ddefs.h"; then
+ AC_DEFINE([SUPERLU_POST_2005_VERSION], 1, [define to 1 if there is a header slu_ddefs.h in SuperLU])
fi
-
- # summary
- DUNE_ADD_SUMMARY_ENTRY([SuperLU],[$with_superlu])
+ fi
- # restore variables
- LDFLAGS="$ac_save_LDFLAGS"
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIBS="$ac_save_LIBS"
- ]
-)
+ # summary
+ DUNE_ADD_SUMMARY_ENTRY([SuperLU],[$with_superlu])
+
+ # restore variables
+ LDFLAGS="$ac_save_LDFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIBS="$ac_save_LIBS"
+])