From fb13191dc76c07dd54c9851095b969ffd508428e Mon Sep 17 00:00:00 2001 From: wccsnow Date: Sun, 5 Aug 2018 11:43:45 -0400 Subject: [PATCH] updates --- configure | 35 ++++++++++++++++++++++++++++++----- configure.ac | 22 +++++++++++++++++----- src/Makevars.in | 1 + 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 7558955..49a17cf 100755 --- a/configure +++ b/configure @@ -634,6 +634,7 @@ MPI_LIBPATH MPI_INCLUDE_PATH MPITYPE MPI_ROOT +TMP_FOUND TMP_LIBNAME TMP_LIB TMP_INC @@ -673,6 +674,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -750,6 +752,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1002,6 +1005,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1139,7 +1151,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1292,6 +1304,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2404,6 +2417,7 @@ if test -z "${MPI_INCLUDE_PATH}" ; then IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then + TMP_FOUND="mpicc --showme" echo "Found mpi.h and libmpi.so ... via mpicc --showme" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" @@ -2463,7 +2477,8 @@ $as_echo "yes" >&6; } IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then - echo "Found mpi.h and libmpi.so ... via pkg-config ... ompi" + TMP_FOUND="pkg-config ompi" + echo "Found mpi.h and libmpi.so ... via pkg-config ompi" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" MPITYPE="OPENMPI" @@ -2471,7 +2486,7 @@ $as_echo "yes" >&6; } MPI_LIBPATH="${TMP_LIB}" MPI_LIBNAME="${TMP_LIBNAME}" else - echo "Found no mpi.h or libmpi.so ... via pkg-config ... ompi" + echo "Found no mpi.h or libmpi.so ... via pkg-config ompi" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -2539,6 +2554,7 @@ if test -z "${MPI_INCLUDE_PATH}" ; then IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then + TMP_FOUND="mpicc --showme & sed" echo "Found mpi.h and libmpich.so ... via mpicc --show & sed" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" @@ -2598,7 +2614,8 @@ $as_echo "yes" >&6; } IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then - echo "Found mpi.h and libmpich.so ... via pkg-config ... mpich" + TMP_FOUND="pkg-config mpich" + echo "Found mpi.h and libmpich.so ... via pkg-config mpich" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" MPITYPE="${MPITYPE}" @@ -2606,7 +2623,7 @@ $as_echo "yes" >&6; } MPI_LIBPATH="${TMP_LIB}" MPI_LIBNAME="${TMP_LIBNAME}" else - echo "Found no mpi.h or libmpich.so ... via pkg-config ... mpich" + echo "Found no mpi.h or libmpich.so ... via pkg-config mpich" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -2620,6 +2637,12 @@ $as_echo "no" >&6; } fi +if test -z "${TMP_FOUND}"; then + TMP_FOUND="Nothing found from mpicc --show & sed nor pkg-config ..." +fi +echo ">> TMP_FOUND = ${TMP_FOUND}" + + if test -z "${MPI_INCLUDE_PATH}" ; then # Check whether --with-mpi was given. @@ -4488,6 +4511,7 @@ echo " " echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" echo ">> TMP_LIBNAME = ${TMP_LIBNAME}" +echo ">> TMP_FOUND = ${TMP_FOUND}" echo ">> MPI_ROOT = ${MPI_ROOT}" echo ">> MPITYPE = ${MPITYPE}" echo ">> MPI_INCLUDE_PATH = ${MPI_INCLUDE_PATH}" @@ -4523,6 +4547,7 @@ echo " " + ac_config_files="$ac_config_files src/Makevars" diff --git a/configure.ac b/configure.ac index a19be02..2246add 100644 --- a/configure.ac +++ b/configure.ac @@ -154,6 +154,7 @@ if test -z "${MPI_INCLUDE_PATH}" ; then IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then + TMP_FOUND="mpicc --showme" echo "Found mpi.h and libmpi.so ... via mpicc --showme" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" @@ -213,7 +214,8 @@ if test -z "${MPI_INCLUDE_PATH}" ; then IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then - echo "Found mpi.h and libmpi.so ... via pkg-config ... ompi" + TMP_FOUND="pkg-config ompi" + echo "Found mpi.h and libmpi.so ... via pkg-config ompi" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" MPITYPE="OPENMPI" @@ -221,7 +223,7 @@ if test -z "${MPI_INCLUDE_PATH}" ; then MPI_LIBPATH="${TMP_LIB}" MPI_LIBNAME="${TMP_LIBNAME}" else - echo "Found no mpi.h or libmpi.so ... via pkg-config ... ompi" + echo "Found no mpi.h or libmpi.so ... via pkg-config ompi" fi else AC_MSG_RESULT([no]) @@ -294,6 +296,7 @@ if test -z "${MPI_INCLUDE_PATH}" ; then IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then + TMP_FOUND="mpicc --showme & sed" echo "Found mpi.h and libmpich.so ... via mpicc --show & sed" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" @@ -353,7 +356,8 @@ if test -z "${MPI_INCLUDE_PATH}" ; then IFS="${TMP_IFS}" if test "${TMP_INC}" != "F" -a "${TMP_LIB}" != "F" ; then - echo "Found mpi.h and libmpich.so ... via pkg-config ... mpich" + TMP_FOUND="pkg-config mpich" + echo "Found mpi.h and libmpich.so ... via pkg-config mpich" echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" MPITYPE="${MPITYPE}" @@ -361,7 +365,7 @@ if test -z "${MPI_INCLUDE_PATH}" ; then MPI_LIBPATH="${TMP_LIB}" MPI_LIBNAME="${TMP_LIBNAME}" else - echo "Found no mpi.h or libmpich.so ... via pkg-config ... mpich" + echo "Found no mpi.h or libmpich.so ... via pkg-config mpich" fi else AC_MSG_RESULT([no]) @@ -374,7 +378,13 @@ if test -z "${MPI_INCLUDE_PATH}" ; then fi -dnl For nothing found from above +dnl Nothing found from above +if test -z "${TMP_FOUND}"; then + TMP_FOUND="Nothing found from mpicc --show & sed nor pkg-config ..." +fi +echo ">> TMP_FOUND = ${TMP_FOUND}" + + dnl 'Paths not specified' if test -z "${MPI_INCLUDE_PATH}" ; then dnl Another way is to specify MPI_ROOT, perhaps via --with-mpi @@ -822,6 +832,7 @@ echo " " echo ">> TMP_INC = ${TMP_INC}" echo ">> TMP_LIB = ${TMP_LIB}" echo ">> TMP_LIBNAME = ${TMP_LIBNAME}" +echo ">> TMP_FOUND = ${TMP_FOUND}" echo ">> MPI_ROOT = ${MPI_ROOT}" echo ">> MPITYPE = ${MPITYPE}" echo ">> MPI_INCLUDE_PATH = ${MPI_INCLUDE_PATH}" @@ -846,6 +857,7 @@ AC_SUBST(ORTERUN) AC_SUBST(TMP_INC) AC_SUBST(TMP_LIB) AC_SUBST(TMP_LIBNAME) +AC_SUBST(TMP_FOUND) AC_SUBST(MPI_ROOT) AC_SUBST(MPITYPE) AC_SUBST(MPI_INCLUDE_PATH) diff --git a/src/Makevars.in b/src/Makevars.in index f3d6830..6b2b686 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -16,6 +16,7 @@ Makeconf: echo "TMP_INC = @TMP_INC@" >> $(USER_CONF) echo "TMP_LIB = @TMP_LIB@" >> $(USER_CONF) echo "TMP_LIBNAME = @TMP_LIBNAME@" >> $(USER_CONF) + echo "TMP_FOUND = @TMP_FOUND@" >> $(USER_CONF) echo "MPI_ROOT = @MPI_ROOT@" >> $(USER_CONF) echo "MPITYPE = @MPITYPE@" >> $(USER_CONF) echo "MPI_INCLUDE_PATH = @MPI_INCLUDE_PATH@" >> $(USER_CONF)