From 12ba7484adccb8c0d7cd9f23c5f3a6c3164c1f57 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 13 Dec 2017 12:18:29 +0000 Subject: [PATCH] Fix check for PSBLAS version limiting USE of modules. --- config/pac.m4 | 6 +- configure | 152 ++++++++++++++++++++++++++++++++++++++++---------- configure.ac | 4 +- 3 files changed, 129 insertions(+), 33 deletions(-) diff --git a/config/pac.m4 b/config/pac.m4 index eb5a7d83..045ca4c7 100644 --- a/config/pac.m4 +++ b/config/pac.m4 @@ -418,7 +418,7 @@ dnl Warning : square brackets are EVIL! AC_LINK_IFELSE([ program test - use psb_base_mod + use psb_base_mod, only : psb_version_major_ print *,psb_version_major_ end program test], [pac_cv_psblas_major=`./conftest${ac_exeext} | sed 's/^ *//'`], @@ -426,7 +426,7 @@ AC_LINK_IFELSE([ AC_LINK_IFELSE([ program test - use psb_base_mod + use psb_base_mod, only : psb_version_minor_ print *,psb_version_minor_ end program test], [pac_cv_psblas_minor=`./conftest${ac_exeext} | sed 's/^ *//'`], @@ -434,7 +434,7 @@ AC_LINK_IFELSE([ AC_LINK_IFELSE([ program test - use psb_base_mod + use psb_base_mod, only : psb_patchlevel_ print *,psb_patchlevel_ end program test], [pac_cv_psblas_patchlevel=`./conftest${ac_exeext} | sed 's/^ *//'`], diff --git a/configure b/configure index 303d438d..333c9301 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for MLD2P4 2.1. +# Generated by GNU Autoconf 2.63 for MLD2P4 2.1.1. # # Report bugs to . # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='MLD2P4' PACKAGE_TARNAME='mld2p4' -PACKAGE_VERSION='2.1' -PACKAGE_STRING='MLD2P4 2.1' +PACKAGE_VERSION='2.1.1' +PACKAGE_STRING='MLD2P4 2.1.1' PACKAGE_BUGREPORT='https://github.com/sfilippone/mld2p4-2/issues' ac_unique_file="mlprec/mld_prec_type.f90" @@ -777,6 +777,7 @@ with_lapack with_mumps with_mumpsdir with_mumpsincdir +with_mumpsmoddir with_mumpslibdir with_umfpack with_umfpackdir @@ -1356,7 +1357,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures MLD2P4 2.1 to adapt to many kinds of systems. +\`configure' configures MLD2P4 2.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1423,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of MLD2P4 2.1:";; + short | recursive ) echo "Configuration of MLD2P4 2.1.1:";; esac cat <<\_ACEOF @@ -1478,6 +1479,7 @@ Optional Packages: MUMPS was configured and installed, at a minimum you will need SCALAPACK and BLAS --with-mumpsincdir=DIR Specify the directory for MUMPS includes. + --with-mumpsmoddir=DIR Specify the directory for MUMPS modules. --with-mumpslibdir=DIR Specify the directory for MUMPS library. --with-umfpack=LIBNAME Specify the library name for UMFPACK and its support libraries. Default: "-lumfpack -lamd" @@ -1587,7 +1589,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -MLD2P4 configure 2.1 +MLD2P4 configure 2.1.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1601,7 +1603,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by MLD2P4 $as_me 2.1, which was +It was created by MLD2P4 $as_me 2.1.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1972,7 +1974,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # VERSION is the file containing the PSBLAS version code # FIXME -mld2p4_cv_version="2.1" +mld2p4_cv_version="2.1.1" # A sample source file @@ -2564,7 +2566,7 @@ fi # Define the identity of the package. PACKAGE='mld2p4' - VERSION='2.1' + VERSION='2.1.1' cat >>confdefs.h <<_ACEOF @@ -6921,7 +6923,7 @@ LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS" cat >conftest.$ac_ext <<_ACEOF program test - use psb_base_mod + use psb_base_mod, only : psb_version_major_ print *,psb_version_major_ end program test _ACEOF @@ -6961,7 +6963,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ cat >conftest.$ac_ext <<_ACEOF program test - use psb_base_mod + use psb_base_mod, only : psb_version_minor_ print *,psb_version_minor_ end program test _ACEOF @@ -7001,7 +7003,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ cat >conftest.$ac_ext <<_ACEOF program test - use psb_base_mod + use psb_base_mod, only : psb_patchlevel_ print *,psb_patchlevel_ end program test _ACEOF @@ -9689,6 +9691,15 @@ fi +# Check whether --with-mumpsmoddir was given. +if test "${with_mumpsmoddir+set}" = set; then + withval=$with_mumpsmoddir; mld2p4_cv_mumpsmoddir=$withval +else + mld2p4_cv_mumpsmoddir='' +fi + + + # Check whether --with-mumpslibdir was given. if test "${with_mumpslibdir+set}" = set; then withval=$with_mumpslibdir; mld2p4_cv_mumpslibdir=$withval @@ -9714,6 +9725,15 @@ elif test "x$mld2p4_cv_mumpsdir" != "x"; then $as_echo "$as_me: mumps dir $mld2p4_cv_mumpsdir" >&6;} MUMPS_INCLUDES="$FMFLAG$mld2p4_cv_mumpsdir" fi +if test "x$mld2p4_cv_mumpsmoddir" != "x"; then + { $as_echo "$as_me:$LINENO: mumps dir $mld2p4_cv_mumpsmoddir" >&5 +$as_echo "$as_me: mumps dir $mld2p4_cv_mumpsmoddir" >&6;} + MUMPS_MODULES="$FMFLAG$mld2p4_cv_mumpsmoddir" +elif test "x$mld2p4_cv_mumpsdir" != "x"; then + { $as_echo "$as_me:$LINENO: mumps dir $mld2p4_cv_mumpsdir" >&5 +$as_echo "$as_me: mumps dir $mld2p4_cv_mumpsdir" >&6;} + MUMPS_MODULES="$FMFLAG$mld2p4_cv_mumpsdir" +fi if test "x$mld2p4_cv_mumpslibdir" != "x"; then MUMPS_LIBS="-L$mld2p4_cv_mumpslibdir" elif test "x$mld2p4_cv_mumpsdir" != "x"; then @@ -9727,7 +9747,7 @@ ac_objext='o' ac_ext='f90' ac_fc="${MPIFC-$FC}"; save_FCFLAGS="$FCFLAGS"; -FCFLAGS=" $MUMPS_INCLUDES $save_FCFLAGS" +FCFLAGS="$MUMPS_MODULES $MUMPS_INCLUDES $save_FCFLAGS" cat >conftest.$ac_ext <<_ACEOF program test @@ -9752,18 +9772,94 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_fc_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - pac_mumps_header_ok=yes; mld2p4_cv_mumpsincdir="$MUMPS_INCLUDES"; + pac_mumps_header_ok=yes; mld2p4_cv_mumpmoddir="$MUMPS_MODULES"; else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - pac_mumps_header_ok=no; MUMPS_INCLUDES="" + pac_mumps_header_ok=no; MUMPS_MODULES="" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x$pac_mumps_header_ok" == "xno" ; then - MUMPS_INCLUDES="$FMFLAG$mld2p4_cv_mumpsdir/include" - FCFLAGS="$MUMPS_INCLUDES $save_CPPFLAGS" + MUMPS_MODULES="$FMFLAG$mld2p4_cv_mumpsdir/include" + FCFLAGS="$MUMPS_MODULES $save_CPPFLAGS" + + cat >conftest.$ac_ext <<_ACEOF + + program test + use dmumps_struc_def + end program test +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_fc_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + pac_mumps_header_ok=yes mld2p4_cv_mumpsmoddir="$MUMPS_MODULES"; +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + pac_mumps_header_ok=no; MUMPS_MODULES="" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +if test "x$pac_mumps_header_ok" == "xno" ; then + MUMPS_MODULES="$FMFLAG$mld2p4_cv_mumpsdir/Include" + FCFLAGS="$MUMPS_MODULES $save_CPPFLAGS" + + cat >conftest.$ac_ext <<_ACEOF + + program test + use dmumps_struc_def + end program test +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_fc_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + pac_mumps_header_ok=yes mld2p4_cv_mumpsmoddir="$MUMPS_MODULES"; +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + pac_mumps_header_ok=no; MUMPS_MODULES="" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +if test "x$pac_mumps_header_ok" == "xno" ; then + MUMPS_MODULES="$FMFLAG$mld2p4_cv_mumpsdir/modules" + FCFLAGS="$MUMPS_MODULES $save_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF @@ -9789,19 +9885,19 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_fc_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - pac_mumps_header_ok=yes mld2p4_cv_mumpsincdir="$MUMPS_INCLUDES"; + pac_mumps_header_ok=yes mld2p4_cv_mumpsmoddir="$MUMPS_MODULES"; else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - pac_mumps_header_ok=no; MUMPS_INCLUDES="" + pac_mumps_header_ok=no; MUMPS_MODULES="" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "x$pac_mumps_header_ok" == "xno" ; then - MUMPS_INCLUDES="$FMFLAG$mld2p4_cv_mumpsdir/Include" - FCFLAGS="$MUMPS_INCLUDES $save_CPPFLAGS" + MUMPS_MODULES="$FMFLAG$mld2p4_cv_mumpsdir/Modules" + FCFLAGS="$MUMPS_MODULES $save_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF @@ -9827,12 +9923,12 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_fc_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - pac_mumps_header_ok=yes mld2p4_cv_mumpsincdir="$MUMPS_INCLUDES"; + pac_mumps_header_ok=yes mld2p4_cv_mumpsmoddir="$MUMPS_MODULES"; else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - pac_mumps_header_ok=no; MUMPS_INCLUDES="" + pac_mumps_header_ok=no; MUMPS_MODULES="" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -9917,7 +10013,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 mld2p4_cv_have_mumps=no;pac_mumps_lib_ok=no; - MUMPS_LIBS="";MUMPS_INCLUDES="" + MUMPS_LIBS="";MUMPS_MODULES="" fi rm -rf conftest.dSYM @@ -9938,8 +10034,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "x$mld2p4_cv_have_mumps" == "xyes" ; then - MUMPS_FLAGS="-DHave_MUMPS_ $MUMPS_INCLUDES" - FDEFINES="$mld_cv_define_prepend-DHAVE_MUMPS_ $mld2p4_cv_mumpsincdir $FDEFINES" + MUMPS_FLAGS="-DHave_MUMPS_ $MUMPS_MODULES" + FDEFINES="$mld_cv_define_prepend-DHAVE_MUMPS_ $mld2p4_cv_mumpsmoddir $FDEFINES" else MUMPS_FLAGS="" fi @@ -12618,7 +12714,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by MLD2P4 $as_me 2.1, which was +This file was extended by MLD2P4 $as_me 2.1.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12672,7 +12768,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -MLD2P4 config.status 2.1 +MLD2P4 config.status 2.1.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 429d541d..ebb3213b 100755 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,11 @@ dnl NOTE : odd configurations like ifc + gcc still await in the mist of the unkn ############################################################################### # NOTE: the literal for version (the second argument to AC_INIT should be a literal!) -AC_INIT([MLD2P4],2.1, [https://github.com/sfilippone/mld2p4-2/issues]) +AC_INIT([MLD2P4],2.1.1, [https://github.com/sfilippone/mld2p4-2/issues]) # VERSION is the file containing the PSBLAS version code # FIXME -mld2p4_cv_version="2.1" +mld2p4_cv_version="2.1.1" # A sample source file AC_CONFIG_SRCDIR([mlprec/mld_prec_type.f90])