mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-11 16:01:00 +08:00
[svn-r6619] Purpose:
Update Description: The "--enable-parallel=TYPE" option was revamped but the help string wasn't modified. Solution: Modified it to print out just "--enable-parallel" because we no longer support the "=TYPE" option. Platforms tested: arabica (Fortran) Modi4 (Parallel & Fortran) Burrwhite (Fortran & C++) Misc. update:
This commit is contained in:
parent
79890b5022
commit
c8f8501ae3
32
configure
vendored
32
configure
vendored
@ -1018,8 +1018,7 @@ Optional Features:
|
||||
is most packages.
|
||||
--enable-trace Enable API tracing capability. Default=no if debug
|
||||
is disabled.
|
||||
--enable-parallel=TYPE Search for MPI-IO and MPI support files
|
||||
--enable-fphdf5 Enable the Flexible Parallel HDF5 interface
|
||||
--enable-parallel Search for MPI-IO and MPI support files
|
||||
--enable-mpe Enable MPE instrumentation [default=no]
|
||||
--enable-filters=all Turn on all internal I/O filters. One may also
|
||||
specify a comma-separated list of filters or the
|
||||
@ -4111,7 +4110,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
||||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4114 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4113 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -4652,7 +4651,7 @@ chmod -w .
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
|
||||
compiler_c_o=no
|
||||
if { (eval echo configure:4655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
if { (eval echo configure:4654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
if test -s out/conftest.err; then
|
||||
@ -6463,7 +6462,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6466 "configure"
|
||||
#line 6465 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -6561,7 +6560,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6564 "configure"
|
||||
#line 6563 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -30758,25 +30757,6 @@ fi
|
||||
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking if Flexible Parallel HDF5 interface enabled" >&5
|
||||
echo $ECHO_N "checking if Flexible Parallel HDF5 interface enabled... $ECHO_C" >&6
|
||||
# Check whether --enable-fphdf5 or --disable-fphdf5 was given.
|
||||
if test "${enable_fphdf5+set}" = set; then
|
||||
enableval="$enable_fphdf5"
|
||||
FPHDF5=$enableval
|
||||
fi;
|
||||
if test "X$FPHDF5" = "Xyes"; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_FPHDF5 1
|
||||
_ACEOF
|
||||
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
fi
|
||||
|
||||
MPE=yes
|
||||
@ -32525,8 +32505,6 @@ PRINT "Features:"
|
||||
PRINT_N " dmalloc"
|
||||
IF_YES_NO "$HAVE_DMALLOC"
|
||||
|
||||
PRINT_N " Flexible Parallel HDF"
|
||||
IF_YES_NO "$FPHDF5"
|
||||
|
||||
PRINT_N " Function Stack Tracing"
|
||||
IF_ENABLED_DISABLED "$FUNCSTACK"
|
||||
|
34
configure.in
34
configure.in
@ -1836,7 +1836,7 @@ dnl or mpcc) then parallel support is enabled but configure doesn't search
|
||||
dnl for any parallel header files or libraries.
|
||||
dnl
|
||||
AC_ARG_ENABLE([parallel],
|
||||
[AC_HELP_STRING([--enable-parallel=TYPE],
|
||||
[AC_HELP_STRING([--enable-parallel],
|
||||
[Search for MPI-IO and MPI support files])])
|
||||
|
||||
AC_MSG_CHECKING([for parallel support files])
|
||||
@ -1948,19 +1948,19 @@ int main(int argc, char **argv)
|
||||
dnl ----------------------------------------------------------------------
|
||||
dnl Check if they would like the "Flexible parallel" functions compiled in
|
||||
dnl
|
||||
AC_MSG_CHECKING([if Flexible Parallel HDF5 interface enabled])
|
||||
AC_ARG_ENABLE([fphdf5],
|
||||
[AC_HELP_STRING([--enable-fphdf5],
|
||||
[Enable the Flexible Parallel HDF5
|
||||
interface])],
|
||||
[FPHDF5=$enableval])
|
||||
if test "X$FPHDF5" = "Xyes"; then
|
||||
AC_DEFINE(HAVE_FPHDF5, 1,
|
||||
[Define if we want flexible parallel HDF5 support])
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
dnl AC_MSG_CHECKING([if Flexible Parallel HDF5 interface enabled])
|
||||
dnl AC_ARG_ENABLE([fphdf5],
|
||||
dnl [AC_HELP_STRING([--enable-fphdf5],
|
||||
dnl [Enable the Flexible Parallel HDF5
|
||||
dnl interface])],
|
||||
dnl [FPHDF5=$enableval])
|
||||
dnl if test "X$FPHDF5" = "Xyes"; then
|
||||
dnl AC_DEFINE(HAVE_FPHDF5, 1,
|
||||
dnl [Define if we want flexible parallel HDF5 support])
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl else
|
||||
dnl AC_MSG_RESULT(no)
|
||||
dnl fi
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------------
|
||||
@ -2414,8 +2414,10 @@ PRINT "Features:"
|
||||
PRINT_N " dmalloc"
|
||||
IF_YES_NO "$HAVE_DMALLOC"
|
||||
|
||||
PRINT_N " Flexible Parallel HDF"
|
||||
IF_YES_NO "$FPHDF5"
|
||||
dnl
|
||||
dnl PRINT_N " Flexible Parallel HDF"
|
||||
dnl IF_YES_NO "$FPHDF5"
|
||||
dnl
|
||||
|
||||
PRINT_N " Function Stack Tracing"
|
||||
IF_ENABLED_DISABLED "$FUNCSTACK"
|
||||
|
2
fortran/configure
vendored
2
fortran/configure
vendored
@ -1001,7 +1001,7 @@ Optional Features:
|
||||
--enable-filters=all Turn on all internal I/O filters. One may also
|
||||
specify a comma-separated list of filters or the
|
||||
word no. The default is all internal I/O filters.
|
||||
--enable-parallel=TYPE Search for MPI-IO and MPI support files
|
||||
--enable-parallel Search for MPI-IO and MPI support files
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
|
@ -649,8 +649,9 @@ dnl `--disable-parallel' but specifies a known parallel compiler (like mpicc
|
||||
dnl or mpcc) then parallel support is enabled but configure doesn't search
|
||||
dnl for any parallel header files or libraries.
|
||||
dnl
|
||||
AC_ARG_ENABLE(parallel,
|
||||
[ --enable-parallel=TYPE Search for MPI-IO and MPI support files])
|
||||
AC_ARG_ENABLE([parallel],
|
||||
[AC_HELP_STRING([--enable-parallel],
|
||||
[Search for MPI-IO and MPI support files])])
|
||||
|
||||
AC_MSG_CHECKING(for parallel support files)
|
||||
case "X-$enable_parallel" in
|
||||
|
Loading…
Reference in New Issue
Block a user