fdurastante/amg4psblas
1
0
Fork 0
mirror of https://github.com/sfilippone/amg4psblas.git synced 2026-10-06 22:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mld2p4-2:

Browse Source 
Make.inc.in
 config/pac.m4
 configure.ac
 configure

Added --with-extra-libs to handle additional requirements coming from,
e.g., SuperLU_Dist needing ParMetis
This commit is contained in:
Salvatore Filippone
2013-07-16 10:43:59 +00:00
parent 69324c2f84
commit 4ba97a56ba
4 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Make.inc.in
+2 -1
View File
@@ -44,8 +44,9 @@ SLUDISTFLAGS=@SLUDIST_FLAGS@
UMFLIBS=@UMF_LIBS@
UMFFLAGS=@UMF_FLAGS@
EXTRALIBS=@EXTRA_LIBS@
MLDLDLIBS=$(SLULIBS) $(SLUDISTLIBS) $(UMFLIBS) $(PSBLDLIBS)
MLDLDLIBS=$(SLULIBS) $(SLUDISTLIBS) $(UMFLIBS) $(EXTRALIBS) $(PSBLDLIBS)
LDLIBS=$(MLDLDLIBS)
#
config/pac.m4
+36 -1
View File
@@ -270,6 +270,41 @@ AC_MSG_RESULT(no)
)
]
)
dnl @synopsis PAC_ARG_WITH_EXTRA_LIBS
dnl
dnl Test for --with-extra-libs="name(s)".
dnl
dnl Appends the specified name(s) to the list of libraries to link
dnl with.
dnl
dnl note: Renamed after PAC_ARG_WITH_EXTRA_LIBS as in the Trilinos package.
dnl
dnl Example use:
dnl
dnl PAC_ARG_WITH_EXTRA_LIBS
dnl
dnl tests for --with-extra-libs and pre-pends to LIBS
dnl
dnl @author Jim Willenbring <jmwille@sandia.gov>
dnl
AC_DEFUN([PAC_ARG_WITH_EXTRA_LIBS],
[
AC_MSG_CHECKING([whether additional libraries are needed])
AC_ARG_WITH(extra-libs,
AC_HELP_STRING([--with-extra-libs],
[List additional link flags here. For example, --with-extra-libs=-lspecial_system_lib
or --with-extra-libs=-L/path/to/libs]),
[
EXTRA_LIBS="${withval}"
AC_MSG_RESULT([EXTRA_LIBS = ${EXTRA_LIBS}])
],
AC_MSG_RESULT(no)
)
]
)
dnl @synopsis PAC_ARG_WITH_PSBLAS
dnl
dnl Test for --with-psblas="pathname".
@@ -903,7 +938,7 @@ if test "x$pac_sludist_header_ok" == "xyes" ; then
SLUDIST_LIBS=""; ])
if test "x$pac_sludist_lib_ok" == "xno" ; then
dnl Maybe lib?
SLUDIST_LIBS="$mld2p4_cv_superludist -L$mld2p4_cv_superludistdir/lib";
SLUDIST_LIBS="$mld2p4_cv_superludist -L$mld2p4_cv_superludistdir/lib";
LIBS="$SLUDIST_LIBS -lm $SAVE_LIBS";
AC_TRY_LINK_FUNC(superlu_malloc_dist,
[mld2p4_cv_have_superludist=yes;pac_sludist_lib_ok=yes;],
configure
Vendored
+13 -11
View File
@@ -646,6 +646,7 @@ UMF_LIBS
UMF_FLAGS
SLU_LIBS
SLU_FLAGS
EXTRA_LIBS
INSTALL_DOCSDIR
INSTALL_INCLUDEDIR
INSTALL_LIBDIR
@@ -716,7 +717,7 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
with_psblas
with_libs
with_extra_libs
with_umfpack
with_umfpackdir
with_umfpackincdir
@@ -1376,9 +1377,9 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-psblas The install directory for PSBLAS, for example,
--with-psblas=/opt/packages/psblas-3.1
--with-libs List additional link flags here. For example,
--with-libs=-lspecial_system_lib or
--with-libs=-L/path/to/libs
--with-extra-libs List additional link flags here. For example,
--with-extra-libs=-lspecial_system_lib or
--with-extra-libs=-L/path/to/libs
--with-umfpack=LIBNAME Specify the library name for UMFPACK library.
Default: "-lumfpack -lamd"
--with-umfpackdir=DIR Specify the directory for UMFPACK library and
@@ -3102,12 +3103,12 @@ fi
{ $as_echo "$as_me:$LINENO: checking whether additional libraries are needed" >&5
$as_echo_n "checking whether additional libraries are needed... " >&6; }
# Check whether --with-libs was given.
if test "${with_libs+set}" = set; then
withval=$with_libs;
LIBS="${withval} ${LIBS}"
{ $as_echo "$as_me:$LINENO: result: LIBS = ${LIBS}" >&5
$as_echo "LIBS = ${LIBS}" >&6; }
# Check whether --with-extra-libs was given.
if test "${with_extra_libs+set}" = set; then
withval=$with_extra_libs;
EXTRA_LIBS="${withval}"
{ $as_echo "$as_me:$LINENO: result: EXTRA_LIBS = ${EXTRA_LIBS}" >&5
$as_echo "EXTRA_LIBS = ${EXTRA_LIBS}" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
@@ -7047,7 +7048,7 @@ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test "x$pac_sludist_lib_ok" == "xno" ; then
SLUDIST_LIBS="$mld2p4_cv_superludist -L$mld2p4_cv_superludistdir/lib";
SLUDIST_LIBS="$mld2p4_cv_superludist -L$mld2p4_cv_superludistdir/lib";
LIBS="$SLUDIST_LIBS -lm $SAVE_LIBS";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -7298,6 +7299,7 @@ rm -f conftest*
###############################################################################
# the following files will be created by Automake
configure.ac
+2 -1
View File
@@ -134,7 +134,7 @@ if eval "$FC -qversion 2>&1 | grep XL 2>/dev/null" ; then
# since (as far as it is known to us) -WF, is not used in earlier versions.
# More problems could be undocumented yet.
fi
PAC_ARG_WITH_LIBS
PAC_ARG_WITH_EXTRA_LIBS
dnl PAC_ARG_WITH_FLAGS(clibs,CLIBS)
dnl PAC_ARG_WITH_FLAGS(flibs,FLIBS)
dnl PAC_ARG_WITH_FLAGS(library-path,LIBRARYPATH)
@@ -265,6 +265,7 @@ AC_SUBST(INSTALL_LIBDIR)
AC_SUBST(INSTALL_INCLUDEDIR)
AC_SUBST(INSTALL_DOCSDIR)
AC_SUBST(EXTRA_LIBS)
AC_SUBST(SLU_FLAGS)
AC_SUBST(SLU_LIBS)
AC_SUBST(UMF_FLAGS)