diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-03-24 19:28:45 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-03-24 19:28:45 (GMT) |
| commit | 55451aef5a015448e74dd5be90d35417b4067b3e (patch) | |
| tree | 7eaecd66644c3bed28f2c38891781f69ad9b4666 | |
| parent | 3061b16d43805cbe5d749ffae06680f82407f024 (diff) | |
| download | hdf5-55451aef5a015448e74dd5be90d35417b4067b3e.zip hdf5-55451aef5a015448e74dd5be90d35417b4067b3e.tar.gz hdf5-55451aef5a015448e74dd5be90d35417b4067b3e.tar.bz2 | |
[svn-r24884] another update to configure.
43 files changed, 74 insertions, 84 deletions
diff --git a/Makefile.in b/Makefile.in index 4d013e1..c1d17a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -310,7 +310,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/Makefile.in b/c++/Makefile.in index b9079bb..45b2c8f 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -275,7 +275,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index ff145c4..aae2d54 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -242,7 +242,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index cafaff2..bb101d7 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -318,7 +318,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index ae9c117..78cb6b8 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -278,7 +278,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ @@ -710,7 +710,6 @@ LL_PATH USE_FILTER_SZIP USE_FILTER_DEFLATE MYIODP_LIBS -MYIOD_CT_LIBS MYIOD_LIBS MYDAOS_LIBS MYPLFS_LIBS @@ -26471,10 +26470,7 @@ fi esac ## ---------------------------------------------------------------------- -## Is the iod present? It has a header file `IOD.h' and a library -## `-liod' and their locations might be specified with the `--with-iod' -## command-line switch. The value is an include path and/or a library path. -## If the library path is specified then it must be preceded by a comma. +## Is the IOD corrupt tool present? ## # Check whether --with-iod-corrupt-tool was given. @@ -26495,12 +26491,15 @@ if test "x$ac_cv_header_iod_corrupt_tool_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_IOD_CORRUPT_TOOL_H 1 _ACEOF - + HAVE_IOD_CORRUPT_TOOL_H="yes" +else + unset HAVE_IOD_CORRUPT_TOOL fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for corrupt_data in -liodcorrupt" >&5 + if test "x$HAVE_IOD_CORRUPT_TOOL" = "xyes" -a "x$HAVE_IOD_CORRUPT_TOOL_H" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for corrupt_data in -liodcorrupt" >&5 $as_echo_n "checking for corrupt_data in -liodcorrupt... " >&6; } if ${ac_cv_lib_iodcorrupt_corrupt_data+:} false; then : $as_echo_n "(cached) " >&6 @@ -26545,20 +26544,27 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodcorrupt_corrupt_data" >&5 $as_echo "$ac_cv_lib_iodcorrupt_corrupt_data" >&6; } if test "x$ac_cv_lib_iodcorrupt_corrupt_data" = xyes; then : - MYIOD_CT_LIBS="-liodcorrupt" + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBIODCORRUPT 1 +_ACEOF + + LIBS="-liodcorrupt $LIBS" + else - unset HAVE_IOD_CORRUPT_TOOL= + unset HAVE_IOD_CORRUPT_TOOL fi - - if test -z "$HAVE_IOD_CORRUPT_TOOL=" -a -n "$HDF5_CONFIG_ABORT"; then - as_fn_error $? "couldn't find iod corrupt tool library" "$LINENO" 5 + fi + if test -z "$HAVE_IOD_CORRUPT_TOOL"; then + if test -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find IOD corrupt tool library" "$LINENO" 5 + fi fi ;; no) - HAVE_IOD_CORRUPT_TOOL=="no" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iod corrupt tool library" >&5 -$as_echo_n "checking for iod corrupt tool library... " >&6; } + HAVE_IOD_CORRUPT_TOOL="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iod corrupt tool" >&5 +$as_echo_n "checking for iod corrupt tool... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5 $as_echo "suppressed" >&6; } ;; @@ -26566,8 +26572,8 @@ $as_echo "suppressed" >&6; } HAVE_IOD_CORRUPT_TOOL="yes" case "$withval" in *,*) - iod_ct_inc="`echo $withval |cut -f1 -d,`" - iod_ct_lib="`echo $withval |cut -f2 -d, -s`" + iod_ct_inc="`echo $withval | cut -f1 -d,`" + iod_ct_lib="`echo $withval | cut -f2 -d, -s`" ;; *) if test -n "$withval"; then @@ -26603,9 +26609,9 @@ if test "x$ac_cv_header_iod_corrupt_tool_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_IOD_CORRUPT_TOOL_H 1 _ACEOF - + HAVE_IOD_CORRUPT_TOOL_H="yes" else - CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" + CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" unset HAVE_IOD_CORRUPT_TOOL fi done @@ -26616,7 +26622,8 @@ done AM_LDFLAGS="$AM_LDFLAGS -L$iod_ct_lib" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for corrupt_data in -liodcorrupt" >&5 + if test "x$HAVE_IOD_CORRUPT_TOOL" = "xyes" -a "x$HAVE_IOD_CORRUPT_TOOL_H" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for corrupt_data in -liodcorrupt" >&5 $as_echo_n "checking for corrupt_data in -liodcorrupt... " >&6; } if ${ac_cv_lib_iodcorrupt_corrupt_data+:} false; then : $as_echo_n "(cached) " >&6 @@ -26661,20 +26668,32 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodcorrupt_corrupt_data" >&5 $as_echo "$ac_cv_lib_iodcorrupt_corrupt_data" >&6; } if test "x$ac_cv_lib_iodcorrupt_corrupt_data" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBIODCORRUPT 1 +_ACEOF + + LIBS="-liodcorrupt $LIBS" -$as_echo "#define HAVE_IOD_CORRUPT_TOOL 1" >>confdefs.h -; IOD_CORRUPT_TOOL="yes" else LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_IOD_CORRUPT_TOOL fi + fi - if test -z "$HAVE_IOD_CORRUPT_TOOL" -a -n "$HDF5_CONFIG_ABORT"; then - as_fn_error $? "couldn't find iod corrupt tool library" "$LINENO" 5 + if test -z "$HAVE_IOD_CORRUPT_TOOL"; then + if test -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find IOD corrupt tool library" "$LINENO" 5 + fi fi ;; esac +if test "x$HAVE_IOD_CORRUPT_TOOL" = "xyes" -a "x$HAVE_IOD_CORRUPT_TOOL_H" = "xyes"; then + +$as_echo "#define HAVE_IOD_CORRUPT_TOOL 1" >>confdefs.h + +fi + ## ---------------------------------------------------------------------- ## Is the iod present? It has a header file `IOD.h' and a library ## `-liod' and their locations might be specified with the `--with-iod' diff --git a/configure.ac b/configure.ac index 7ed57df..9066973 100644 --- a/configure.ac +++ b/configure.ac @@ -1995,10 +1995,7 @@ case $withval in esac ## ---------------------------------------------------------------------- -## Is the iod present? It has a header file `IOD.h' and a library -## `-liod' and their locations might be specified with the `--with-iod' -## command-line switch. The value is an include path and/or a library path. -## If the library path is specified then it must be preceded by a comma. +## Is the IOD corrupt tool present? ## AC_ARG_WITH([iod-corrupt-tool], [AS_HELP_STRING([--with-iod-corrupt-tool=DIR], @@ -2008,24 +2005,27 @@ AC_ARG_WITH([iod-corrupt-tool], case $withval in yes) HAVE_IOD_CORRUPT_TOOL="yes" - AC_CHECK_HEADERS([iod_corrupt_tool.h]) - AC_CHECK_LIB([iodcorrupt], [corrupt_data],[MYIOD_CT_LIBS="-liodcorrupt"], [unset HAVE_IOD_CORRUPT_TOOL=]) - AC_SUBST([MYIOD_CT_LIBS]) - if test -z "$HAVE_IOD_CORRUPT_TOOL=" -a -n "$HDF5_CONFIG_ABORT"; then - AC_MSG_ERROR([couldn't find iod corrupt tool library]) + AC_CHECK_HEADERS([iod_corrupt_tool.h], [HAVE_IOD_CORRUPT_TOOL_H="yes"], [unset HAVE_IOD_CORRUPT_TOOL]) + if test "x$HAVE_IOD_CORRUPT_TOOL" = "xyes" -a "x$HAVE_IOD_CORRUPT_TOOL_H" = "xyes"; then + AC_CHECK_LIB([iodcorrupt], [corrupt_data],, [unset HAVE_IOD_CORRUPT_TOOL]) + fi + if test -z "$HAVE_IOD_CORRUPT_TOOL"; then + if test -n "$HDF5_CONFIG_ABORT"; then + AC_MSG_ERROR([couldn't find IOD corrupt tool library]) + fi fi ;; no) - HAVE_IOD_CORRUPT_TOOL=="no" - AC_MSG_CHECKING([for iod corrupt tool library]) + HAVE_IOD_CORRUPT_TOOL="no" + AC_MSG_CHECKING([for iod corrupt tool]) AC_MSG_RESULT([suppressed]) ;; *) HAVE_IOD_CORRUPT_TOOL="yes" case "$withval" in *,*) - iod_ct_inc="`echo $withval |cut -f1 -d,`" - iod_ct_lib="`echo $withval |cut -f2 -d, -s`" + iod_ct_inc="`echo $withval | cut -f1 -d,`" + iod_ct_lib="`echo $withval | cut -f2 -d, -s`" ;; *) if test -n "$withval"; then @@ -2054,24 +2054,32 @@ case $withval in AM_CPPFLAGS="$AM_CPPFLAGS -I$iod_ct_inc" fi - AC_CHECK_HEADERS([iod_corrupt_tool.h],,[CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"]) + AC_CHECK_HEADERS([iod_corrupt_tool.h], + [HAVE_IOD_CORRUPT_TOOL_H="yes"], + [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_IOD_CORRUPT_TOOL]) if test -n "$iod_ct_lib"; then LDFLAGS="$LDFLAGS -L$iod_ct_lib" AM_LDFLAGS="$AM_LDFLAGS -L$iod_ct_lib" fi - AC_CHECK_LIB([iodcorrupt], [corrupt_data], - [AC_DEFINE([HAVE_IOD_CORRUPT_TOOL], [1], [Define if IOD corruption code should be built]); IOD_CORRUPT_TOOL="yes"], - [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_IOD_CORRUPT_TOOL], - ) + if test "x$HAVE_IOD_CORRUPT_TOOL" = "xyes" -a "x$HAVE_IOD_CORRUPT_TOOL_H" = "xyes"; then + AC_CHECK_LIB([iodcorrupt], [corrupt_data],, + [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_IOD_CORRUPT_TOOL]) + fi - if test -z "$HAVE_IOD_CORRUPT_TOOL" -a -n "$HDF5_CONFIG_ABORT"; then - AC_MSG_ERROR([couldn't find iod corrupt tool library]) + if test -z "$HAVE_IOD_CORRUPT_TOOL"; then + if test -n "$HDF5_CONFIG_ABORT"; then + AC_MSG_ERROR([couldn't find IOD corrupt tool library]) + fi fi ;; esac +if test "x$HAVE_IOD_CORRUPT_TOOL" = "xyes" -a "x$HAVE_IOD_CORRUPT_TOOL_H" = "xyes"; then + AC_DEFINE([HAVE_IOD_CORRUPT_TOOL], [1], [Define if IOD corruption code should be built]) +fi + ## ---------------------------------------------------------------------- ## Is the iod present? It has a header file `IOD.h' and a library ## `-liod' and their locations might be specified with the `--with-iod' diff --git a/examples/Makefile.in b/examples/Makefile.in index 0fa523f..20a6906 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -242,7 +242,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 9105a99..d1a3786 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -279,7 +279,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 80fe4aa..9c5b71b 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -250,7 +250,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 733b6ee..6c9ca3d 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -369,7 +369,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 650d832..285a961 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -353,7 +353,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 4b78277..daba4c6 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -277,7 +277,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 767f555..6b51c55 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -279,7 +279,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index b68a2af..c306dea 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -275,7 +275,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 28fdea3..91c1889 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -241,7 +241,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index ec37c15..16cc935 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -309,7 +309,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 4d2411e..0dcb2e1 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -274,7 +274,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index f034b6e..9e87cf4 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -241,7 +241,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 438e295..ac4e1a3 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -279,7 +279,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index e941592..3e74b0c 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -242,7 +242,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index ae4ae7b..3083891 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -325,7 +325,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 97af674..4e9c7e8 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -288,7 +288,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index dea8af2..b3796f4 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -308,7 +308,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 457b7a5..ab9c1c5 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -315,7 +315,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 5694291..5c2e51c 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -276,7 +276,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 020ac8d..185e590 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -290,7 +290,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 41ded3f..ece4aa6 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -316,7 +316,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/src/H5config.h.in b/src/H5config.h.in index d17cb59..65e0938 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -235,6 +235,9 @@ /* Define to 1 if you have the `iod' library (-liod). */ #undef HAVE_LIBIOD +/* Define to 1 if you have the `iodcorrupt' library (-liodcorrupt). */ +#undef HAVE_LIBIODCORRUPT + /* Define to 1 if you have the `lmpe' library (-llmpe). */ #undef HAVE_LIBLMPE diff --git a/src/Makefile.in b/src/Makefile.in index a69556f..5929b3d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -378,7 +378,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/test/Makefile.in b/test/Makefile.in index 9b1318c..94934a9 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -708,7 +708,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index a3fdf31..0e2631f 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -303,7 +303,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 6d9a87b..342a2c5 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -276,7 +276,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 0aec377..a739282 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -282,7 +282,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 68b239d..5ad5bd0 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -289,7 +289,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index ed36b74..52b819f 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -284,7 +284,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 5732f11..4ce07c4 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -282,7 +282,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 1a51fd3..bb4e653 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -296,7 +296,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 56b501d..9d12a09 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -276,7 +276,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index ae02fa8..2f2a361 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -332,7 +332,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 9a767b9..a54e858 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -311,7 +311,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 36c9ff2..dae3924 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -274,7 +274,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 738ee57..4ab7bbf 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -336,7 +336,6 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ -MYIOD_CT_LIBS = @MYIOD_CT_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ |