From 637a01a47ae44ce58054585ad175d0223f558843 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 10 Dec 2018 17:28:14 +0000 Subject: [PATCH] Update minimum version requirements. --- config/pac.m4 | 81 ++++++++++++++++-- configure | 230 +++++++++++++++++++++++++++++++------------------- configure.ac | 20 +++-- 3 files changed, 230 insertions(+), 101 deletions(-) diff --git a/config/pac.m4 b/config/pac.m4 index 612dd816..896847b8 100644 --- a/config/pac.m4 +++ b/config/pac.m4 @@ -440,26 +440,91 @@ AC_LINK_IFELSE([ end program test], [pac_cv_psblas_patchlevel=`./conftest${ac_exeext} | sed 's/^ *//'`], [pac_cv_psblas_patchlevel="unknown"]) +LDFLAGS="$save_LDFLAGS"; +FCFLAGS="$save_FCFLAGS"; + +AC_MSG_RESULT([Done]) +AC_LANG_POP([Fortran])]) + + +dnl @synopsis PAC_FORTRAN_PSBLAS_INTEGER_SIZES( ) +dnl +dnl Will try to compile, link and run a program using the PSBLAS library. \ +dnl Checks for size of integers +dnl +dnl Will use MPIFC, otherwise '$FC'. +dnl +dnl +dnl @author Salvatore Filippone +dnl +AC_DEFUN(PAC_FORTRAN_PSBLAS_INTEGER_SIZES, +[AC_MSG_CHECKING([for PSBLAS integer sizes]) +AC_LANG_PUSH([Fortran]) +ac_exeext='' +ac_objext='o' +ac_ext='f90' +save_FCFLAGS=$FCFLAGS; +FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS" +save_LDFLAGS=$LDFLAGS; +if test "x$pac_cv_psblas_libdir" != "x"; then +dnl AC_MSG_NOTICE([psblas lib dir $pac_cv_psblas_libdir]) + PSBLAS_LIBS="-L$pac_cv_psblas_libdir" +elif test "x$pac_cv_psblas_dir" != "x"; then +dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir]) + PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib" +fi +if test "x$pac_cv_psblas_moddir" != "x"; then +dnl AC_MSG_NOTICE([psblas modules dir $pac_cv_psblas_moddir]) + PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_moddir $PSBLAS_INCLUDES" +elif test "x$pac_cv_psblas_dir" != "x"; then +dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir]) + PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES" +fi +FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS" +PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS" +LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS" + +dnl ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext 1>&5' +dnl ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FCFLAGS $LDFLAGS conftest.$ac_ext $FMFLAG$PSBLAS_DIR/include -L$PSBLAS_DIR/lib -lpsb_base $LIBS 1>&5' +dnl Warning : square brackets are EVIL! + AC_LINK_IFELSE([ program test - use psb_base_mod, only : psb_sizeof_ip - print *,psb_sizeof_ip + use iso_fortran_env + use psb_base_mod + if (psb_ipk_ == int32) then + print *, '4' + elseif (psb_ipk_ == int64) then + print *, '8' + else + print *, '-1' + end if end program test], - [pac_cv_psblas_sizeof_ip=`./conftest${ac_exeext} | sed 's/^ *//'`], - [pac_cv_psblas_sizeof_ip="unknown"]) + [pac_cv_psblas_ipk=`./conftest${ac_exeext} | sed 's/^ *//'`], + [pac_cv_psblas_ipk="unknown"]) + AC_LINK_IFELSE([ program test - use psb_base_mod, only : psb_sizeof_lp - print *,psb_sizeof_lp + use iso_fortran_env + use psb_base_mod + if (psb_lpk_ == int32) then + print *, '4' + elseif (psb_lpk_ == int64) then + print *, '8' + else + print *, '-1' + end if end program test], - [pac_cv_psblas_sizeof_lp=`./conftest${ac_exeext} | sed 's/^ *//'`], - [pac_cv_psblas_sizeof_lp="unknown"]) + [pac_cv_psblas_lpk=`./conftest${ac_exeext} | sed 's/^ *//'`], + [pac_cv_psblas_lpk="unknown"]) LDFLAGS="$save_LDFLAGS"; FCFLAGS="$save_FCFLAGS"; AC_MSG_RESULT([Done]) AC_LANG_POP([Fortran])]) + + dnl @synopsis PAC_CHECK_UMFPACK dnl dnl Will try to find the UMFPACK library and headers. diff --git a/configure b/configure index 74b60bc9..65a5c661 100755 --- a/configure +++ b/configure @@ -7040,11 +7040,82 @@ fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +LDFLAGS="$save_LDFLAGS"; +FCFLAGS="$save_FCFLAGS"; + +{ $as_echo "$as_me:$LINENO: result: Done" >&5 +$as_echo "Done" >&6; } +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +if test "x$pac_cv_psblas_major" == "xunknown"; then + { { $as_echo "$as_me:$LINENO: error: PSBLAS version major \"$pac_cv_psblas_major\"." >&5 +$as_echo "$as_me: error: PSBLAS version major \"$pac_cv_psblas_major\"." >&2;} + { (exit 1); exit 1; }; } +fi +if test "x$pac_cv_psblas_minor" == "xunknown"; then + { { $as_echo "$as_me:$LINENO: error: PSBLAS version minor \"$pac_cv_psblas_minor\"." >&5 +$as_echo "$as_me: error: PSBLAS version minor \"$pac_cv_psblas_minor\"." >&2;} + { (exit 1); exit 1; }; } +fi +if test "x$pac_cv_psblas_patchlevel" == "xunknown"; then + { { $as_echo "$as_me:$LINENO: error: PSBLAS patchlevel \"$pac_cv_psblas_patchlevel\"." >&5 +$as_echo "$as_me: error: PSBLAS patchlevel \"$pac_cv_psblas_patchlevel\"." >&2;} + { (exit 1); exit 1; }; } +fi +if (( $pac_cv_psblas_major < 3 )) || + ( (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 7 ))) ; then + { { $as_echo "$as_me:$LINENO: error: I need at least PSBLAS version 3.7." >&5 +$as_echo "$as_me: error: I need at least PSBLAS version 3.7." >&2;} + { (exit 1); exit 1; }; } +else + { $as_echo "$as_me:$LINENO: Am configuring with PSBLAS version $pac_cv_psblas_major.$pac_cv_psblas_minor.$pac_cv_psblas_patchlevel." >&5 +$as_echo "$as_me: Am configuring with PSBLAS version $pac_cv_psblas_major.$pac_cv_psblas_minor.$pac_cv_psblas_patchlevel." >&6;} +fi +{ $as_echo "$as_me:$LINENO: checking for PSBLAS integer sizes" >&5 +$as_echo_n "checking for PSBLAS integer sizes... " >&6; } +ac_ext=${ac_fc_srcext-f} +ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' +ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_fc_compiler_gnu + +ac_exeext='' +ac_objext='o' +ac_ext='f90' +save_FCFLAGS=$FCFLAGS; +FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS" +save_LDFLAGS=$LDFLAGS; +if test "x$pac_cv_psblas_libdir" != "x"; then + PSBLAS_LIBS="-L$pac_cv_psblas_libdir" +elif test "x$pac_cv_psblas_dir" != "x"; then + PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib" +fi +if test "x$pac_cv_psblas_moddir" != "x"; then + PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_moddir $PSBLAS_INCLUDES" +elif test "x$pac_cv_psblas_dir" != "x"; then + PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES" +fi +FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS" +PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS" +LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS" + + cat >conftest.$ac_ext <<_ACEOF program test - use psb_base_mod, only : psb_sizeof_ip - print *,psb_sizeof_ip + use iso_fortran_env + use psb_base_mod + if (psb_ipk_ == int32) then + print *, '4' + elseif (psb_ipk_ == int64) then + print *, '8' + else + print *, '-1' + end if end program test _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -7068,22 +7139,30 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - pac_cv_psblas_sizeof_ip=`./conftest${ac_exeext} | sed 's/^ *//'` + pac_cv_psblas_ipk=`./conftest${ac_exeext} | sed 's/^ *//'` else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - pac_cv_psblas_sizeof_ip="unknown" + pac_cv_psblas_ipk="unknown" fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF program test - use psb_base_mod, only : psb_sizeof_lp - print *,psb_sizeof_lp + use iso_fortran_env + use psb_base_mod + if (psb_lpk_ == int32) then + print *, '4' + elseif (psb_lpk_ == int64) then + print *, '8' + else + print *, '-1' + end if end program test _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -7107,12 +7186,12 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - pac_cv_psblas_sizeof_lp=`./conftest${ac_exeext} | sed 's/^ *//'` + pac_cv_psblas_lpk=`./conftest${ac_exeext} | sed 's/^ *//'` else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - pac_cv_psblas_sizeof_lp="unknown" + pac_cv_psblas_lpk="unknown" fi rm -rf conftest.dSYM @@ -7129,33 +7208,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - -if test "x$pac_cv_psblas_major" == "xunknown"; then - { { $as_echo "$as_me:$LINENO: error: PSBLAS version major \"$pac_cv_psblas_major\"." >&5 -$as_echo "$as_me: error: PSBLAS version major \"$pac_cv_psblas_major\"." >&2;} - { (exit 1); exit 1; }; } -fi -if test "x$pac_cv_psblas_minor" == "xunknown"; then - { { $as_echo "$as_me:$LINENO: error: PSBLAS version minor \"$pac_cv_psblas_minor\"." >&5 -$as_echo "$as_me: error: PSBLAS version minor \"$pac_cv_psblas_minor\"." >&2;} - { (exit 1); exit 1; }; } -fi -if test "x$pac_cv_psblas_patchlevel" == "xunknown"; then - { { $as_echo "$as_me:$LINENO: error: PSBLAS patchlevel \"$pac_cv_psblas_patchlevel\"." >&5 -$as_echo "$as_me: error: PSBLAS patchlevel \"$pac_cv_psblas_patchlevel\"." >&2;} - { (exit 1); exit 1; }; } -fi -if (( $pac_cv_psblas_major < 3 )) || - ( (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 6 ))) ; then - { { $as_echo "$as_me:$LINENO: error: I need at least PSBLAS version 3.6." >&5 -$as_echo "$as_me: error: I need at least PSBLAS version 3.6." >&2;} - { (exit 1); exit 1; }; } -else - { $as_echo "$as_me:$LINENO: Am configuring with PSBLAS version $pac_cv_psblas_major.$pac_cv_psblas_minor.$pac_cv_psblas_patchlevel." >&5 -$as_echo "$as_me: Am configuring with PSBLAS version $pac_cv_psblas_major.$pac_cv_psblas_minor.$pac_cv_psblas_patchlevel." >&6;} -fi -{ $as_echo "$as_me:$LINENO: PSBLAS size of LPK \"$pac_cv_psblas_sizeof_lp\"." >&5 -$as_echo "$as_me: PSBLAS size of LPK \"$pac_cv_psblas_sizeof_lp\"." >&6;} +{ $as_echo "$as_me:$LINENO: PSBLAS size of LPK \"$pac_cv_psblas_lpk\"." >&5 +$as_echo "$as_me: PSBLAS size of LPK \"$pac_cv_psblas_lpk\"." >&6;} ############################################################################### # Parachute rules for ar and ranlib ... (could cause problems) ############################################################################### @@ -7630,25 +7684,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# -# Optional features -# - -{ $as_echo "$as_me:$LINENO: checking support for Fortran VOLATILE" >&5 -$as_echo_n "checking support for Fortran VOLATILE... " >&6; } +{ $as_echo "$as_me:$LINENO: checking support for ISO_FORTRAN_ENV" >&5 +$as_echo_n "checking support for ISO_FORTRAN_ENV... " >&6; } ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_fc_compiler_gnu ac_exeext='' - ac_ext='F90' + ac_ext='f90' ac_fc=${MPIFC-$FC}; cat >conftest.$ac_ext <<_ACEOF -program conftest - integer, volatile :: i, j -end program conftest + program test + use iso_fortran_env + end program test _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -7670,7 +7720,7 @@ $as_echo "$ac_try_echo") >&5 } && test -s conftest.$ac_objext; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } - FDEFINES="$psblas_cv_define_prepend-DHAVE_VOLATILE $FDEFINES" + : else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -7679,6 +7729,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 $as_echo "no" >&6; } echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + { { $as_echo "$as_me:$LINENO: error: Sorry, cannot build PSBLAS without support for ISO_FORTRAN_ENV. + Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.8." >&5 +$as_echo "$as_me: error: Sorry, cannot build PSBLAS without support for ISO_FORTRAN_ENV. + Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.8." >&2;} + { (exit 1); exit 1; }; } fi @@ -7691,9 +7746,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking test GENERIC interfaces" >&5 -$as_echo_n "checking test GENERIC interfaces... " >&6; } -ac_ext=${ac_fc_srcext-f} +# +# Optional features +# + +{ $as_echo "$as_me:$LINENO: checking support for Fortran VOLATILE" >&5 +$as_echo_n "checking support for Fortran VOLATILE... " >&6; } + ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_fc_compiler_gnu @@ -7703,19 +7762,9 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu ac_fc=${MPIFC-$FC}; cat >conftest.$ac_ext <<_ACEOF -module conftest - - interface foo - subroutine i_sub_foo(v) - integer, intent(inout) :: v(:) - end subroutine i_sub_foo - end interface foo - - interface bar - procedure i_sub_foo - end interface bar - -end module conftest +program conftest + integer, volatile :: i, j +end program conftest _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -7737,7 +7786,7 @@ $as_echo "$ac_try_echo") >&5 } && test -s conftest.$ac_objext; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } - : + FDEFINES="$psblas_cv_define_prepend-DHAVE_VOLATILE $FDEFINES" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -7746,7 +7795,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 $as_echo "no" >&6; } echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - FDEFINES="$psblas_cv_define_prepend-DHAVE_BUGGY_GENERICS $FDEFINES" fi @@ -7759,25 +7807,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking support for Fortran FLUSH statement" >&5 -$as_echo_n "checking support for Fortran FLUSH statement... " >&6; } - ac_ext=${ac_fc_srcext-f} +{ $as_echo "$as_me:$LINENO: checking test GENERIC interfaces" >&5 +$as_echo_n "checking test GENERIC interfaces... " >&6; } +ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_fc_compiler_gnu ac_exeext='' - ac_ext='f90' + ac_ext='F90' ac_fc=${MPIFC-$FC}; cat >conftest.$ac_ext <<_ACEOF -program conftest - integer :: iunit=10 - open(10) - write(10,*) 'Test ' - flush(10) - close(10) -end program conftest +module conftest + + interface foo + subroutine i_sub_foo(v) + integer, intent(inout) :: v(:) + end subroutine i_sub_foo + end interface foo + + interface bar + procedure i_sub_foo + end interface bar + +end module conftest _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -7799,7 +7853,7 @@ $as_echo "$ac_try_echo") >&5 } && test -s conftest.$ac_objext; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } - FDEFINES="$psblas_cv_define_prepend-DHAVE_FLUSH_STMT $FDEFINES" + : else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -7808,6 +7862,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 $as_echo "no" >&6; } echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + FDEFINES="$psblas_cv_define_prepend-DHAVE_BUGGY_GENERICS $FDEFINES" fi @@ -7820,8 +7875,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking support for ISO_FORTRAN_ENV" >&5 -$as_echo_n "checking support for ISO_FORTRAN_ENV... " >&6; } +{ $as_echo "$as_me:$LINENO: checking support for Fortran FLUSH statement" >&5 +$as_echo_n "checking support for Fortran FLUSH statement... " >&6; } ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' @@ -7832,9 +7887,13 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu ac_fc=${MPIFC-$FC}; cat >conftest.$ac_ext <<_ACEOF - program test - use iso_fortran_env - end program test +program conftest + integer :: iunit=10 + open(10) + write(10,*) 'Test ' + flush(10) + close(10) +end program conftest _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -7856,7 +7915,7 @@ $as_echo "$ac_try_echo") >&5 } && test -s conftest.$ac_objext; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } - FDEFINES="$psblas_cv_define_prepend-DHAVE_ISO_FORTRAN_ENV $FDEFINES" + FDEFINES="$psblas_cv_define_prepend-DHAVE_FLUSH_STMT $FDEFINES" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -7877,6 +7936,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + { $as_echo "$as_me:$LINENO: checking support for Fortran FINAL" >&5 $as_echo_n "checking support for Fortran FINAL... " >&6; } ac_ext=${ac_fc_srcext-f} @@ -10747,9 +10807,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test "x$pac_cv_psblas_sizeof_lp" == "x8" ; then - { $as_echo "$as_me:$LINENO: PSBLAS defines PSB_LPK_ as $pac_cv_psblas_sizeof_lp. We cannot interface MUMPS. " >&5 -$as_echo "$as_me: PSBLAS defines PSB_LPK_ as $pac_cv_psblas_sizeof_lp. We cannot interface MUMPS. " >&6;} +if test "x$pac_cv_psblas_lpk" == "x8" ; then + { $as_echo "$as_me:$LINENO: PSBLAS defines PSB_LPK_ as $pac_cv_psblas_lpk. We cannot interface MUMPS. " >&5 +$as_echo "$as_me: PSBLAS defines PSB_LPK_ as $pac_cv_psblas_lpk. We cannot interface MUMPS. " >&6;} MUMPS_FLAGS="" MUMPS_LIBS="" mld2p4_cv_have_mumps="no"; diff --git a/configure.ac b/configure.ac index c11eced1..8d38359e 100755 --- a/configure.ac +++ b/configure.ac @@ -490,12 +490,13 @@ if test "x$pac_cv_psblas_patchlevel" == "xunknown"; then AC_MSG_ERROR([PSBLAS patchlevel "$pac_cv_psblas_patchlevel".]) fi if (( $pac_cv_psblas_major < 3 )) || - ( (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 6 ))) ; then - AC_MSG_ERROR([I need at least PSBLAS version 3.6.]) + ( (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 7 ))) ; then + AC_MSG_ERROR([I need at least PSBLAS version 3.7.]) else AC_MSG_NOTICE([Am configuring with PSBLAS version $pac_cv_psblas_major.$pac_cv_psblas_minor.$pac_cv_psblas_patchlevel.]) fi -AC_MSG_NOTICE([PSBLAS size of LPK "$pac_cv_psblas_sizeof_lp".]) +PAC_FORTRAN_PSBLAS_INTEGER_SIZES() +AC_MSG_NOTICE([PSBLAS size of LPK "$pac_cv_psblas_lpk".]) ############################################################################### # Parachute rules for ar and ranlib ... (could cause problems) ############################################################################### @@ -571,6 +572,12 @@ PAC_FORTRAN_TEST_ISO_C_BIND( Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.8.])] ) +PAC_FORTRAN_TEST_ISO_FORTRAN_ENV( + [], + [AC_MSG_ERROR([Sorry, cannot build PSBLAS without support for ISO_FORTRAN_ENV. + Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.8.])] +) + # # Optional features # @@ -588,9 +595,6 @@ PAC_FORTRAN_TEST_FLUSH( [FDEFINES="$psblas_cv_define_prepend-DHAVE_FLUSH_STMT $FDEFINES"], ) -PAC_FORTRAN_TEST_ISO_FORTRAN_ENV( - [FDEFINES="$psblas_cv_define_prepend-DHAVE_ISO_FORTRAN_ENV $FDEFINES"], -) PAC_FORTRAN_TEST_FINAL( [FDEFINES="$psblas_cv_define_prepend-DHAVE_FINAL $FDEFINES"], @@ -630,8 +634,8 @@ AC_LANG([C]) PAC_CHECK_MUMPS -if test "x$pac_cv_psblas_sizeof_lp" == "x8" ; then - AC_MSG_NOTICE([PSBLAS defines PSB_LPK_ as $pac_cv_psblas_sizeof_lp. We cannot interface MUMPS. ]) +if test "x$pac_cv_psblas_lpk" == "x8" ; then + AC_MSG_NOTICE([PSBLAS defines PSB_LPK_ as $pac_cv_psblas_lpk. We cannot interface MUMPS. ]) MUMPS_FLAGS="" MUMPS_LIBS="" mld2p4_cv_have_mumps="no";