From ed4d8af66ea9168113b22cb537736153ccd5ee25 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 15 Jan 2009 16:21:16 +0000 Subject: [PATCH] - patch from Mark revied and applied - all "echo" calls removed by AC_MSG_XXX - strict indention --- configure.ac | 566 +++++++++++++++++++++++++-------------------------- 1 file changed, 283 insertions(+), 283 deletions(-) diff --git a/configure.ac b/configure.ac index 4cd5fcb..ce57f47 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Every configure script must call AC_INIT before doing anything else. # AC_INIT (package, version, [bug-report], [tarname]) -AC_INIT([H5Part], [1.4.0], [h5part@lists.psi.ch], H5Part) +AC_INIT([H5Part], [1.4.1], [h5part@lists.psi.ch], H5Part) # Ensure that a recent enough version of Autoconf is being used. @@ -26,27 +26,27 @@ AC_ARG_ENABLE( AC_ARG_ENABLE( [fortran], - [AC_HELP_STRING([--enable-fortran], + [AC_HELP_STRING([--enable-fortran], [Compile the Fortran interface [default=no]])], - [USE_FORTRAN=$enableval]) + [USE_FORTRAN=$enableval]) AC_ARG_ENABLE( [parallel], - [AC_HELP_STRING([--enable-parallel], + [AC_HELP_STRING([--enable-parallel], [Compile the MPI/IO interface [default=no]])], - [USE_PARALLEL=$enableval]) + [USE_PARALLEL=$enableval]) AC_ARG_ENABLE( [tools], - [AC_HELP_STRING([--enable-tools], + [AC_HELP_STRING([--enable-tools], [Compile h5part tools [default=no]])], - [USE_TOOLS=$enableval]) + [USE_TOOLS=$enableval]) AC_ARG_WITH( [mpipath], [AC_HELP_STRING([--with-mpipath], [path to MPI installation [default=""]])], - [MPIPATH=$withval], [MPIPATH=""]) + [MPIPATH=$withval], [MPIPATH=""]) AC_ARG_WITH( [hdf5path], @@ -54,6 +54,13 @@ AC_ARG_WITH( [path to HDF5 installation [default=""]])], [HDF5PATH=$withval], [HDF5PATH=""]) +AC_ARG_WITH( + [mpiposix], + [AC_HELP_STRING([--with-mpiposix], + [enable MPI-POSIX VFD in HDF5 [default=no]])], + [USE_MPIPOSIX=$enableval]) + + ############################################################################### ################# A SIMPLE WORK AROUND TO USE ENV. VARS ####################### ############################################################################### @@ -85,35 +92,26 @@ SAVE_LDFLAGS=$LDFLAGS # @enddesc #@@*/ -PATH_Search() -{ - eval $1="" - if test $# -lt 4 ; then - h5part_basedir="" - else - h5part_basedir="$4/" - fi - for h5part_place in $2 - do - echo -n "looking in $h5part_place ... $ac_c" #1>&6 - if test -r "$h5part_basedir$h5part_place/$3" ; then - echo "$ac_t"" found" #1>&6 - eval $1="$h5part_place" - break - fi - if test -d "$h5part_basedir$h5part_place/$3" ; then - echo "$ac_t"" found" #1>&6 - eval $1="$h5part_place" - break - fi - echo "$ac_t"" no" #1>&6 - done - - return +PATH_Search() { + eval $1="" + if test $# -lt 4 ; then + h5part_basedir="" + else + h5part_basedir="$4/" + fi + for h5part_place in $2; do + AC_MSG_CHECKING([looking in $h5part_place ... ]) + if test -r "$h5part_basedir$h5part_place/$3" ; then + AC_MSG_RESULT([found]) + eval $1="$h5part_place" + break + fi + AC_MSG_RESULT([no]) + done + return } - ############################################################################### ############# MISC SETTINGS INCLUDING C & C++ COMPILER SETTING ################ ############################################################################### @@ -124,32 +122,12 @@ AC_CANONICAL_HOST uname=`uname -s` if test $uname = "AIX"; then - AC_MSG_CHECKING([if system is AIX]) - AC_MSG_RESULT([OK]) + AC_MSG_CHECKING([if system is AIX]) + AC_MSG_RESULT([OK]) - # If on AIX, define _ALL_SOURCE. Allows the use of some BSD functions. - # Should be called before any macros that run the C compiler. - AC_AIX -fi - - -# DAVINCI SPECIFIC!!! -if test `uname -n` = "davinci"; then - echo "DAVINCI SPECIFIC TESTING FOR STDC++ LIBRARY!" - PATH_Search STDCXX_CHECK '/usr/lib64 /usr/lib' libstdc++.a - - # if STDCXX_CHECK is set... - if test "$STDCXX_CHECK" = "/usr/lib64"; then - echo "STDCXX setting ..." - echo "STDCXX_CHECK = $STDCXX_CHECK ..." - STDCXX="-L/usr/lib64 -lstdc++" - echo "STDCXX = $STDCXX ..." - elif test "$STDCXX_CHECK" = "/usr/lib"; then - echo "STDCXX setting ..." - echo "STDCXX_CHECK = $STDCXX_CHECK ..." - STDCXX="-L/usr/lib -lstdc++" - echo "STDCXX = $STDCXX ..." - fi + # If on AIX, define _ALL_SOURCE. Allows the use of some BSD functions. + # Should be called before any macros that run the C compiler. + AC_AIX fi @@ -165,9 +143,9 @@ AC_PATH_PROGS([BAS_CC], [cc_r], [], [$PATH]) # if BAS_CC not empty if test -n "$BAS_CC"; then - echo "CC setting for Bassi ..." - CC=$BAS_CC - echo "CC = $CC ..." + AC_MSG_CHECKING([CC setting for Bassi]) + CC=$BAS_CC + AC_MSG_RESULT([CC = $CC]) fi @@ -181,6 +159,16 @@ fi AC_PROG_CXX(pathCC icc cc_r g++ gcc cc) +# DAVINCI SPECIFIC!!! +AC_MSG_CHECKING([for icc linker -lstdc++ flag]) +if test ${CXX} = "icc"; then + AC_MSG_RESULT([yes]) + STDCXX="-lstdc++" +else + AC_MSG_RESULT([no]) +fi + + # Set output variable INSTALL to the path of a BSD-compatible install program, # if one is found in the current PATH. # Otherwise, set INSTALL to `dir/install-sh -c` @@ -218,186 +206,199 @@ AC_MSG_CHECKING([if 64-bit compilation is enabled]) # If --enable-64 is set in the configure line if test "X$USE_64" = "Xyes"; then - AC_MSG_RESULT([yes]) - if test $uname = "AIX"; then - CFLAGS="$CFLAGS -q64" - FFLAGS="$FFLAGS -q64" - fi + AC_MSG_RESULT([yes]) + if test $uname = "AIX"; then + CFLAGS="$CFLAGS -q64" + FFLAGS="$FFLAGS -q64" + fi - if test $uname = "IRIX64"; then - CFLAGS="$CFLAGS -64" - FFLAGS="$FFLAGS -64 -fPIC -fno-second-underscore" - fi + if test $uname = "IRIX64"; then + CFLAGS="$CFLAGS -64" + FFLAGS="$FFLAGS -64 -fPIC -fno-second-underscore" + fi else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) fi ############################ fortran enabled ################################## AC_MSG_CHECKING([if fortran interface enabled]) if test "X$USE_FORTRAN" = "Xyes"; then - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([yes]) - AC_PROG_FC(ifort xlf_r pathf90 g95 g90 ftn gfortran) - if test -z "$FC" ; then - AC_MSG_ERROR([Cannot find a fortran compiler!!!]) - exit 1 - fi + AC_PROG_FC(ifort xlf_r pathf90 g95 g90 ftn gfortran) + if test -z "$FC" ; then + AC_MSG_ERROR([Cannot find a fortran compiler!!!]) + exit 1 + fi - if test ! $uname = "AIX"; then - FFLAGS="${FFLAGS} -fPIC -fno-second-underscore" - fi + if test ! $uname = "AIX"; then + FFLAGS="${FFLAGS} -fPIC" + fi + + if test $FC = "g90"; then + FFLAGS="${FFLAGS} -fno-second-underscore" + fi - AC_MSG_CHECKING([symbol convention in object files]) - `cd src && rm -f TestUnderscore.o TestUnderscoreC.o TestUnderscore` - `cd src && ${FC} ${FFLAGS} -c TestUnderscore.f` - `cd src && ${CC} ${CFLAGS} -c TestUnderscoreC.c` - `cd src && ${FC} ${FFLAGS} -o TestUnderscore TestUnderscore.o TestUnderscoreC.o -lc` + if test $FC = "g95"; then + FFLAGS="${FFLAGS} -fno-second-underscore" + fi - if test -f src/TestUnderscore ; then - UNDERSCORE_H=Underscore.h - `cd src && ./TestUnderscore > Underscore.h` - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([nok]) - AC_MSG_ERROR([Cannot build fortran executables!!!]) - exit 1 - fi + AC_MSG_CHECKING([symbol convention in object files]) + `cd src && rm -f TestUnderscore.o TestUnderscoreC.o TestUnderscore` + `cd src && ${FC} ${FFLAGS} -c TestUnderscore.f` + `cd src && ${CC} ${CFLAGS} -c TestUnderscoreC.c` +# `cd src && ${FC} ${FFLAGS} -o TestUnderscore TestUnderscore.o TestUnderscoreC.o -lc` + `cd src && ${FC} ${FFLAGS} -o TestUnderscore TestUnderscore.o TestUnderscoreC.o` + + if test -f src/TestUnderscore ; then + UNDERSCORE_H=Underscore.h + `cd src && ./TestUnderscore > Underscore.h` + AC_MSG_RESULT([ok]) + else + AC_MSG_RESULT([nok]) + AC_MSG_ERROR([Cannot build fortran executables!!!]) + exit 1 + fi else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) fi ######################## parallel interface enabled ########################### AC_MSG_CHECKING([if parallel interface enabled]) if test "X$USE_PARALLEL" = "Xyes"; then - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([yes]) - CFLAGS="${CFLAGS} -DPARALLEL_IO -DH5_HAVE_PARALLEL -DMPICH_IGNORE_CXX_SEEK" + CFLAGS="${CFLAGS} -DPARALLEL_IO -DH5_HAVE_PARALLEL -DMPICH_IGNORE_CXX_SEEK" - AC_MSG_CHECKING([if we can compile MPI code without setting flags]) - AC_TRY_LINK([#include "mpi.h"], [ - MPI_Comm comm; - int n; - MPI_Comm_size( comm, &n ); ], - [echo 'yes'; r='yes'], [echo "no"; r='no'] ) + AC_MSG_CHECKING([if we can compile MPI code without setting flags]) + AC_TRY_LINK([#include "mpi.h"], [ + MPI_Comm comm; + int n; + MPI_Comm_size( comm, &n ); ], + [AC_MSG_RESULT([yes]); r='yes'], [AC_MSG_RESULT([no]); r='no'] ) - if test "X$r" = "Xno"; then - AC_PATH_PROGS([MPICC], [mpicc mpcc_r], [], [$PATH]) - AC_PATH_PROGS([MPICXX], [mpicxx mpcc_r], [], [$PATH]) - if test -z "$MPICC" -o -z "$MPICXX"; then - AC_MSG_CHECKING([for MPI root ]) - AC_MSG_RESULT([]) - if test -n "$MPIROOT"; then - P=${MPIROOT} - elif test -n "$MPIHOME"; then - P=${MPIHOME} - elif test -n "$MPIPATH"; then - P=${MPIPATH} - else - P='' - P="$P /usr" - P="$P /usr/local" - P="$P /usr/local/mpi" - P="$P /usr/local/packages/mpi" - P="$P /usr/local/mpich2" - P="$P /usr/local/mpich" - P="$P /opt/xt-mpt/default/mpich2-64/P2" - fi - PATH_Search MPIROOT "$P" include/mpi.h - if test ! -n "$MPIROOT"; then - AC_MSG_ERROR([Cannot determine MPI root!!!]) - exit 1 - fi - - if test -e "${MPIROOT}/bin/mpicc"; then - MPICC=${MPIROOT}/bin/mpicc - fi - - if test -e "${MPIROOT}/bin/mpicxx"; then - MPICXX=${MPIROOT}/bin/mpicxx - fi + if test "X$USE_MPIPOSIX" = "Xyes"; then + CFLAGS="${CFLAGS} -DH5PART_MPIPOSIX" fi + + if test "X$r" = "Xno"; then + AC_PATH_PROGS([MPICC], [mpicc mpcc_r], [], [$PATH]) + AC_PATH_PROGS([MPICXX], [mpicxx mpcc_r], [], [$PATH]) + if test -z "$MPICC" -o -z "$MPICXX"; then + AC_MSG_CHECKING([for MPI root ]) + AC_MSG_RESULT([]) + if test -n "$MPIROOT"; then + P=${MPIROOT} + elif test -n "$MPIHOME"; then + P=${MPIHOME} + elif test -n "$MPIPATH"; then + P=${MPIPATH} + else + P='' + P="$P /usr" + P="$P /usr/local" + P="$P /usr/local/mpi" + P="$P /usr/local/packages/mpi" + P="$P /usr/local/mpich2" + P="$P /usr/local/mpich" + P="$P /opt/xt-mpt/default/mpich2-64/P2" + fi + PATH_Search MPIROOT "$P" include/mpi.h + if test ! -n "$MPIROOT"; then + AC_MSG_ERROR([Cannot determine MPI root!!!]) + exit 1 + fi - if test -z "$MPICC" -o -z "$MPICXX"; then - MPIINC="${MPIINC} -I${MPIROOT}/include" - FFLAGS="${FFLAGS} -I${MPIROOT}/include" - AC_MSG_CHECKING([for name of MPI lib ]) - if test -e ${MPIROOT}/lib/libmpi.a; then - MPILIB="-L${MPIROOT}/lib -lmpi" - elif test -e ${MPIROOT}/lib/libmpi.so; then - MPILIB="-L${MPIROOT}/lib -lmpi" - elif test -e ${MPIROOT}/lib/libmpich.a; then - MPILIB="-L${MPIROOT}/lib -lmpich" - elif test -e ${MPIROOT}/lib/libmpich.so; then - MPILIB="-L${MPIROOT}/lib -lmpich" - else - AC_MSG_RESULT([not found]) - exit 1 - fi - AC_MSG_RESULT([${MPILIB}]) - fi + if test -e "${MPIROOT}/bin/mpicc"; then + MPICC=${MPIROOT}/bin/mpicc + fi - if test -n "$MPICC"; then - CC=${MPICC} - fi + if test -e "${MPIROOT}/bin/mpicxx"; then + MPICXX=${MPIROOT}/bin/mpicxx + fi + fi + + if test -z "$MPICC" -o -z "$MPICXX"; then + MPIINC="${MPIINC} -I${MPIROOT}/include" + FFLAGS="${FFLAGS} -I${MPIROOT}/include" + AC_MSG_CHECKING([for name of MPI lib ]) + if test -e ${MPIROOT}/lib/libmpi.a; then + MPILIB="-L${MPIROOT}/lib -lmpi" + elif test -e ${MPIROOT}/lib/libmpi.so; then + MPILIB="-L${MPIROOT}/lib -lmpi" + elif test -e ${MPIROOT}/lib/libmpich.a; then + MPILIB="-L${MPIROOT}/lib -lmpich" + elif test -e ${MPIROOT}/lib/libmpich.so; then + MPILIB="-L${MPIROOT}/lib -lmpich" + else + AC_MSG_RESULT([not found]) + exit 1 + fi + AC_MSG_RESULT([${MPILIB}]) + fi + + if test -n "$MPICC"; then + CC=${MPICC} + fi - if test -n "$MPICXX"; then - CXX=${MPICXX} - fi - fi - - MTARGET="libpH5Part.a" - TTARGET="H5PartTestP H5PartAndreasTest Bench" - TTARGET="${TTARGET} H5BlockTestAttributes" - TTARGET="${TTARGET} H5BlockParTestScalarField" - - # parallel + fortran - if test "X$USE_FORTRAN" = "Xyes"; then - AC_PATH_PROGS([MPIFC], [mpxlf_r mpif90], [], [$PATH]) - - if test -z "${MPIFC}" ; then - if test -e "${MPIROOT}/bin/mpif90"; then - MPIFC=${MPIROOT}/bin/mpif90 - fi + if test -n "$MPICXX"; then + CXX=${MPICXX} + fi fi - - # if MPIFC empty - if test ! -n "$MPIFC"; then - AC_MSG_CHECKING([ No MPIFC detected. Setting MPIFC to FC.]) - MPIFC=$FC - echo "MPIFC = $MPIFC ..." - fi - if test -n "$MPIFC"; then - FC=${MPIFC} - fi + MTARGET="libpH5Part.a" + TTARGET="H5PartTestP H5PartAndreasTest Bench" + TTARGET="${TTARGET} H5BlockTestAttributes" + TTARGET="${TTARGET} H5BlockParTestScalarField" + + # parallel + fortran + if test "X$USE_FORTRAN" = "Xyes"; then + AC_PATH_PROGS([MPIFC], [mpxlf_r mpif90], [], [$PATH]) + + if test -z "${MPIFC}" ; then + if test -e "${MPIROOT}/bin/mpif90"; then + MPIFC=${MPIROOT}/bin/mpif90 + fi + fi - MTARGET="${MTARGET} libpH5PartF.a" - TTARGET="${TTARGET} H5testFpar" - TTARGET="${TTARGET} H5BlockParTestScalarFieldF" - fi + # if MPIFC empty + if test ! -n "$MPIFC"; then + AC_MSG_CHECKING([ No MPIFC detected. Setting MPIFC to FC.]) + MPIFC=$FC + AC_MSG_RESULT([MPIFC = $MPIFC]) + fi + + if test -n "$MPIFC"; then + FC=${MPIFC} + fi + + MTARGET="${MTARGET} libpH5PartF.a" + TTARGET="${TTARGET} H5testFpar" + TTARGET="${TTARGET} H5BlockParTestScalarFieldF" + fi else # --enable-parallel=no - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) - MTARGET="libH5Part.a" - TTARGET="H5PartTest H5test" - TTARGET="${TTARGET} H5BlockTestAttributes" + MTARGET="libH5Part.a" + TTARGET="H5PartTest H5test" + TTARGET="${TTARGET} H5BlockTestAttributes" - if test "X$USE_FORTRAN" = "Xyes"; then - MTARGET="${MTARGET} libH5PartF.a" - TTARGET="${TTARGET} H5testF" - TTARGET="${TTARGET} H5BlockTestAttributesF" - fi + if test "X$USE_FORTRAN" = "Xyes"; then + MTARGET="${MTARGET} libH5PartF.a" + TTARGET="${TTARGET} H5testF" + TTARGET="${TTARGET} H5BlockTestAttributesF" + fi fi AC_MSG_CHECKING([wheter tools are enabled]) if test "X$USE_TOOLS" = "Xyes"; then - AC_MSG_RESULT([yes]) - BUILD_TOOLS="h5pAttrib h5pToGNUplot # homdynToH5p" + AC_MSG_RESULT([yes]) + BUILD_TOOLS="h5pAttrib h5pToGNUplot # homdynToH5p" else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) fi ############################################################################### @@ -407,58 +408,58 @@ fi AC_MSG_CHECKING([for HDF5 root ]) AC_MSG_RESULT([]) if test -n "${HDF5ROOT}"; then - P=${HDF5ROOT} + P=${HDF5ROOT} elif test -n "${HDF5HOME}" ; then - P=${HDF5HOME} + P=${HDF5HOME} elif test -n "${HDF5PATH}" ; then - P=${HDF5PATH} + P=${HDF5PATH} else - P='' - P="$P /usr" - P="$P /usr/local" - P="$P /usr/local/hdf5" - P="$P /usr/local/packages/hdf5" - P="$P /apps/hdf5" + P='' + P="$P /usr" + P="$P /usr/local" + P="$P /usr/local/hdf5" + P="$P /usr/local/packages/hdf5" + P="$P /apps/hdf5" - if test "X$USE_PARALLEL" = "Xyes"; then - P="$P /usr/local/phdf5" - P="$P /usr/local/hdf5/hdf5_par" - if test "X$USE_64" = "Xyes"; then - P="$P /usr/common/usg/hdf5/64/default/parallel" - else - P="$P /usr/common/usg/hdf5/32/default/parallel" - fi - else - P="$P /usr/local/hdf5/hdf5_serial" - if test "X$USE_64" = "Xyes"; then - P="$P /usr/common/usg/hdf5/64/default/serial" - else - P="$P /usr/common/usg/hdf5/32/default/serial" - fi - fi + if test "X$USE_PARALLEL" = "Xyes"; then + P="$P /usr/local/phdf5" + P="$P /usr/local/hdf5/hdf5_par" + if test "X$USE_64" = "Xyes"; then + P="$P /usr/common/usg/hdf5/64/default/parallel" + else + P="$P /usr/common/usg/hdf5/32/default/parallel" + fi + else + P="$P /usr/local/hdf5/hdf5_serial" + if test "X$USE_64" = "Xyes"; then + P="$P /usr/common/usg/hdf5/64/default/serial" + else + P="$P /usr/common/usg/hdf5/32/default/serial" + fi + fi fi PATH_Search HDF5ROOT "$P" include/hdf5.h if test -z "$HDF5ROOT"; then - AC_MSG_ERROR([Cannot determine HDF5 root!!!]) - exit 1 + AC_MSG_ERROR([Cannot determine HDF5 root!!!]) + exit 1 fi AC_MSG_CHECKING([if we need to link to libsz ]) if test -n "$HDF5ROOT"; then - if test -f $HDF5ROOT/lib/libsz.a; then - AC_MSG_RESULT([yes]) - SZLIB="-L$HDF5ROOT/lib/ -lsz" - else - AC_MSG_RESULT([no]) - SZLIB="" - fi + if test -f $HDF5ROOT/lib/libsz.a; then + AC_MSG_RESULT([yes]) + SZLIB="-L$HDF5ROOT/lib/ -lsz" + else + AC_MSG_RESULT([no]) + SZLIB="" + fi fi AC_MSG_CHECKING([for static zlib root ]) -echo +AC_MSG_RESULT([ ]) PATH_Search ZLIBROOT '/apps/zlib' lib/libz.a if test -n "$ZLIBROOT"; then - LDFLAGS="$LDFLAGS -L$ZLIBROOT/lib" + LDFLAGS="$LDFLAGS -L$ZLIBROOT/lib" fi @@ -474,65 +475,65 @@ H5P_LIB_LOC=`pwd`/src #if there was an external input for the variable... if test -n "$SAVE_CC"; then -CC=$SAVE_CC + CC=$SAVE_CC fi if test -n "$SAVE_CXX"; then -CXX=$SAVE_CXX + CXX=$SAVE_CXX fi if test -n "$SAVE_FC"; then -FC=$SAVE_FC + FC=$SAVE_FC fi if test -n "$SAVE_MPICC"; then -MPICC=$SAVE_MPICC + MPICC=$SAVE_MPICC fi if test -n "$SAVE_MPICXX"; then -MPICXX=$SAVE_MPICXX + MPICXX=$SAVE_MPICXX fi if test -n "$SAVE_MPIFC"; then -MPIFC=$SAVE_MPIFC + MPIFC=$SAVE_MPIFC fi if test -n "$SAVE_MPILIB"; then -MPILIB=$SAVE_MPILIB + MPILIB=$SAVE_MPILIB fi if test -n "$SAVE_MPIINC"; then -MPIINC=$SAVE_MPIINC + MPIINC=$SAVE_MPIINC fi if test -n "$SAVE_CFLAGS"; then -CFLAGS="$SAVE_CFLAGS ${CFLAGS}" + CFLAGS="$SAVE_CFLAGS ${CFLAGS}" fi if test -n "$SAVE_FFLAGS"; then -FFLAGS=$SAVE_FFLAGS + FFLAGS=$SAVE_FFLAGS fi if test -n "$SAVE_MPIROOT"; then -MPIROOT=$SAVE_MPIROOT + MPIROOT=$SAVE_MPIROOT fi if test -n "$SAVE_HDF5ROOT"; then -HDF5ROOT=$SAVE_HDF5ROOT + HDF5ROOT=$SAVE_HDF5ROOT fi if test -n "$SAVE_LDFLAGS"; then -LDFLAGS=$SAVE_LDFLAGS + LDFLAGS=$SAVE_LDFLAGS fi if test -n "$MPICXX"; then -TOOLS_CXX=$MPICXX -TOOLS_H5PART_LIB="-lpH5Part" -TOOLS_HDFLIB="-L$HDF5ROOT/lib -lhdf5" + TOOLS_CXX=$MPICXX + TOOLS_H5PART_LIB="-lpH5Part" + TOOLS_HDFLIB="-L$HDF5ROOT/lib -lhdf5" else -TOOLS_CXX=$CXX -TOOLS_H5PART_LIB="-lH5Part" -TOOLS_HDFLIB="-L$HDF5ROOT/lib -lhdf5" + TOOLS_CXX=$CXX + TOOLS_H5PART_LIB="-lH5Part" + TOOLS_HDFLIB="-L$HDF5ROOT/lib -lhdf5" fi ############################################################################### @@ -581,27 +582,26 @@ AC_OUTPUT ############################################################################### ########################## PRINTING SUMMARY ################################### ############################################################################### -echo -echo -echo "Summary for `(hostname || uname -n) 2>/dev/null | sed 1q`:" -echo -echo "Host OS: $host_os" -echo "Host CPU: $host_cpu" -echo "Host vendor: $host_vendor" -echo "Build libraries: $MTARGET" -echo "Build test programs: $TTARGET" -echo "Build tools: $BUILD_TOOLS" -echo "CC = $CC" -echo "CXX = $CXX" -echo "FC = $FC" -echo "MPICC = $MPICC" -echo "MPICXX = $MPICXX" -echo "MPIFC = $MPIFC" -echo "CFLAGS = $CFLAGS" -echo "FFLAGS = $FFLAGS" -echo "MPILIB = $MPILIB" -echo "MPIINC = $MPIINC" -echo "MPIROOT = $MPIROOT" -echo "HDF5ROOT = $HDF5ROOT" -echo "LDFLAGS = $LDFLAGS" -echo +AC_MSG_RESULT([ ]) +AC_MSG_RESULT([Summary:]) +AC_MSG_RESULT([ ]) +AC_MSG_RESULT([Host OS: $host_os]) +AC_MSG_RESULT([Host CPU: $host_cpu]) +AC_MSG_RESULT([Host vendor: $host_vendor]) +AC_MSG_RESULT([Build libraries: $MTARGET]) +AC_MSG_RESULT([Build test programs: $TTARGET]) +AC_MSG_RESULT([Build tools: $BUILD_TOOLS]) +AC_MSG_RESULT([CC = $CC]) +AC_MSG_RESULT([CXX = $CXX]) +AC_MSG_RESULT([FC = $FC]) +AC_MSG_RESULT([MPICC = $MPICC]) +AC_MSG_RESULT([MPICXX = $MPICXX]) +AC_MSG_RESULT([MPIFC = $MPIFC]) +AC_MSG_RESULT([CFLAGS = $CFLAGS]) +AC_MSG_RESULT([FFLAGS = $FFLAGS]) +AC_MSG_RESULT([MPILIB = $MPILIB]) +AC_MSG_RESULT([MPIINC = $MPIINC]) +AC_MSG_RESULT([MPIROOT = $MPIROOT]) +AC_MSG_RESULT([HDF5ROOT = $HDF5ROOT]) +AC_MSG_RESULT([LDFLAGS = $LDFLAGS]) +AC_MSG_RESULT([ ]) \ No newline at end of file