From 2c257321a06a2a6a8b21f3ca87b707b9bc45b056 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 24 Apr 2020 16:18:10 +0200 Subject: [PATCH] Regenerate configure script from latest updates for SuperLU_DIST --- configure | 151 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 89 insertions(+), 62 deletions(-) diff --git a/configure b/configure index 47514f7a..151ec7dd 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.69 for MLD2P4 2.1.1. +# Generated by GNU Autoconf 2.69 for MLD2P4 2.3.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='MLD2P4' PACKAGE_TARNAME='mld2p4' -PACKAGE_VERSION='2.1.1' -PACKAGE_STRING='MLD2P4 2.1.1' +PACKAGE_VERSION='2.3.1' +PACKAGE_STRING='MLD2P4 2.3.1' PACKAGE_BUGREPORT='https://github.com/sfilippone/mld2p4-2/issues' PACKAGE_URL='' @@ -1337,7 +1337,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.1 to adapt to many kinds of systems. +\`configure' configures MLD2P4 2.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1403,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of MLD2P4 2.1.1:";; + short | recursive ) echo "Configuration of MLD2P4 2.3.1:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -MLD2P4 configure 2.1.1 +MLD2P4 configure 2.3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2208,7 +2208,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.1, which was +It was created by MLD2P4 $as_me 2.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2559,7 +2559,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # VERSION is the file containing the PSBLAS version code # FIXME -mld2p4_cv_version="2.1.1" +mld2p4_cv_version="2.3.1" # A sample source file @@ -3180,7 +3180,7 @@ fi # Define the identity of the package. PACKAGE='mld2p4' - VERSION='2.1.1' + VERSION='2.3.1' cat >>confdefs.h <<_ACEOF @@ -9132,11 +9132,12 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pac_sludist_lib_ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pac_sludist_lib_ok" >&5 $as_echo "$pac_sludist_lib_ok" >&6; } - if test "x$pac_sludist_lib_ok" == "xyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for superlu_dist version 6" >&5 -$as_echo_n "checking for superlu_dist version 6... " >&6; } +fi + +if test "x$pac_sludist_lib_ok" == "xyes" ; then + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9144,41 +9145,60 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_cc=${MPICC-$CC} + ac_exeext=""; + CPPFLAGS="$SLUDIST_INCLUDES $save_CPPFLAGS" + LIBS="$SLUDIST_LIBS -lm $save_LIBS"; cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include "superlu_ddefs.h" - int testdslud() - { dLUstruct_t *LUstruct; - int n; - dLUstructInit(n, LUstruct); - } +#include + #include + + void main() + { int i=SUPERLU_DIST_MAJOR_VERSION; + printf("%d\n",i); + } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; pac_sludist_version="6"; +if ac_fn_c_try_link "$LINENO"; then : + mld2p4_cv_superludist_major=`./conftest${ac_exeext} | sed 's/^ *//'` else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; pac_sludist_version=""; + mld2p4_cv_superludist_major="unknown" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + + void main() + { int i=SUPERLU_DIST_MINOR_VERSION; + printf("%d\n",i); + } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + mld2p4_cv_superludist_minor=`./conftest${ac_exeext} | sed 's/^ *//'` +else + mld2p4_cv_superludist_minor="unknown" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext 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_sludist_version" == "x" ; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for superlu_dist version 4" >&5 + if test "x$mld2p4_cv_superludist_major" == "xunknown" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for superlu_dist version 4" >&5 $as_echo_n "checking for superlu_dist version 4... " >&6; } - ac_ext=c + 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 - ac_cc=${MPICC-$CC} - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cc=${MPICC-$CC} + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "superlu_ddefs.h" int testdslud() @@ -9189,71 +9209,78 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; pac_sludist_version="4"; +$as_echo "yes" >&6; }; mld2p4_cv_superludist_major="4"; mld2p4_cv_superludist_minor=""; else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; pac_sludist_version="3"; +$as_echo "no" >&6; }; mld2p4_cv_superludist_major="3"; mld2p4_cv_superludist_minor=""; fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c + 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_sludist_version" == "x4" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for superlu_dist version 5" >&5 + if test "x$mld2p4_cv_superludist_major" == "x4" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for superlu_dist version 5" >&5 $as_echo_n "checking for superlu_dist version 5... " >&6; } - ac_ext=c + 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 - ac_cc=${MPICC-$CC} - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cc=${MPICC-$CC} + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "superlu_ddefs.h" - int testdslud() - { superlu_dist_options_t options; - int n; - set_default_options_dist(&options); - } + int testdslud() + { superlu_dist_options_t options; + int n; + set_default_options_dist(&options); + } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; pac_sludist_version="5"; +$as_echo "yes" >&6; }; mld2p4_cv_superludist_major="5"; mld2p4_cv_superludist_minor=""; else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; pac_sludist_version="4"; +$as_echo "no" >&6; }; mld2p4_cv_superludist_major="4"; mld2p4_cv_superludist_minor=""; fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c + 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 - + fi fi - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor." >&5 +$as_echo "$as_me: SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor." >&6;} + else SLUDIST_LIBS=""; SLUDIST_INCLUDES=""; fi -fi - LIBS="$save_LIBS"; CPPFLAGS="$save_CPPFLAGS"; CC="$save_CC"; -ac_ext=c + 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$mld2p4_cv_have_superludist" == "xyes" ; then + pac_sludist_version="$mld2p4_cv_superludist_major"; + if (($mld2p4_cv_superludist_major==6)); then + if (($mld2p4_cv_superludist_minor>=3)); then + pac_sludist_version="63"; + fi + fi SLUDIST_FLAGS="" SLUDIST_FLAGS="-DHave_SLUDist_ -DSLUD_VERSION_$pac_sludist_version $SLUDIST_INCLUDES" FDEFINES="$mld_cv_define_prepend-DHAVE_SLUDIST_ $FDEFINES" @@ -9919,7 +9946,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.1, which was +This file was extended by MLD2P4 $as_me 2.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9976,7 +10003,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -MLD2P4 config.status 2.1.1 +MLD2P4 config.status 2.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -10664,10 +10691,10 @@ fi ${PACKAGE_NAME} ${mld2p4_cv_version} has been configured as follows: PSBLAS library : ${PSBLAS_DIR} - MUMPS : ${mld2p4_cv_have_mumps} - SuperLU : ${mld2p4_cv_have_superlu} - SuperLU_Dist : ${mld2p4_cv_have_superludist} - UMFPack : ${mld2p4_cv_have_umfpack} + MUMPS detected : ${mld2p4_cv_have_mumps} + SuperLU detected : ${mld2p4_cv_have_superlu} + SuperLU_Dist detected : ${mld2p4_cv_have_superludist} + UMFPack detected : ${mld2p4_cv_have_umfpack} If you are satisfied, run 'make' to build ${PACKAGE_NAME} and its documentation; otherwise type ./configure --help=short for a complete list of configure options specific to ${PACKAGE_NAME}. @@ -10676,10 +10703,10 @@ $as_echo "$as_me: ${PACKAGE_NAME} ${mld2p4_cv_version} has been configured as follows: PSBLAS library : ${PSBLAS_DIR} - MUMPS : ${mld2p4_cv_have_mumps} - SuperLU : ${mld2p4_cv_have_superlu} - SuperLU_Dist : ${mld2p4_cv_have_superludist} - UMFPack : ${mld2p4_cv_have_umfpack} + MUMPS detected : ${mld2p4_cv_have_mumps} + SuperLU detected : ${mld2p4_cv_have_superlu} + SuperLU_Dist detected : ${mld2p4_cv_have_superludist} + UMFPack detected : ${mld2p4_cv_have_umfpack} If you are satisfied, run 'make' to build ${PACKAGE_NAME} and its documentation; otherwise type ./configure --help=short for a complete list of configure options specific to ${PACKAGE_NAME}.