diff options
42 files changed, 340 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index ae2301e..fdbf3d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -308,6 +308,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/Makefile.in b/c++/Makefile.in index 888c44e..58d66ea 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -273,6 +273,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 968d029..c55fff0 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -240,6 +240,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 619aa76..95996bb 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -316,6 +316,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 7e0c718..13056e6 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -276,6 +276,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ @@ -709,6 +709,7 @@ BUILD_SHARED_SZIP_CONDITIONAL_TRUE LL_PATH USE_FILTER_SZIP USE_FILTER_DEFLATE +MYIODP_LIBS MYIOD_LIBS MYDAOS_LIBS MYPLFS_LIBS @@ -940,6 +941,7 @@ with_axe with_plfs with_daos with_iod +with_iodp with_zlib with_szlib with_pthread @@ -1714,6 +1716,7 @@ Optional Packages: --with-plfs=DIR Use plfs [default=no] --with-daos=DIR Use daos [default=no] --with-iod=DIR Use iod [default=no] + --with-iodp=DIR Use iodp [default=no] --with-zlib=DIR Use zlib library for external deflate I/O filter [default=yes] --with-szlib=DIR Use szlib library for external szlib I/O filter @@ -26328,7 +26331,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iod_iod_initialize" >&5 $as_echo "$ac_cv_lib_iod_iod_initialize" >&6; } if test "x$ac_cv_lib_iod_iod_initialize" = xyes; then : - MYIOD_LIBS="-liod -lmdhim -lpbl" + MYIOD_LIBS="-liod" else unset HAVE_IOD fi @@ -26356,6 +26359,214 @@ $as_echo "suppressed" >&6; } if test -n "$withval"; then iod_inc="$withval/include" iod_lib="$withval/lib" + fi + ;; + esac + + ## Trying to include -I/usr/include and -L/usr/lib is redundant and + ## can mess some compilers up. + if test "X$iod_inc" = "X/usr/include"; then + iod_inc="" + fi + if test "X$iod_lib" = "X/usr/lib"; then + iod_lib="" + fi + + saved_CPPFLAGS="$CPPFLAGS" + saved_AM_CPPFLAGS="$AM_CPPFLAGS" + saved_LDFLAGS="$LDFLAGS" + saved_AM_LDFLAGS="$AM_LDFLAGS" + + if test -n "$iod_inc"; then + CPPFLAGS="$CPPFLAGS -I$iod_inc" + AM_CPPFLAGS="$AM_CPPFLAGS -I$iod_inc" + fi + + for ac_header in iod_api.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "iod_api.h" "ac_cv_header_iod_api_h" "$ac_includes_default" +if test "x$ac_cv_header_iod_api_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IOD_API_H 1 +_ACEOF + +else + CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" +fi + +done + + + if test -n "$iod_lib"; then + LDFLAGS="$LDFLAGS -L$iod_lib" + AM_LDFLAGS="$AM_LDFLAGS -L$iod_lib" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iod_finalize in -liod" >&5 +$as_echo_n "checking for iod_finalize in -liod... " >&6; } +if ${ac_cv_lib_iod_iod_finalize+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-liod $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char iod_finalize (); +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return iod_finalize (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_iod_iod_finalize=yes +else + ac_cv_lib_iod_iod_finalize=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iod_iod_finalize" >&5 +$as_echo "$ac_cv_lib_iod_iod_finalize" >&6; } +if test "x$ac_cv_lib_iod_iod_finalize" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBIOD 1 +_ACEOF + + LIBS="-liod $LIBS" + +else + LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_IOD +fi + + + if test -z "$HAVE_IOD" -a -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find iod library" "$LINENO" 5 + 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. +## + +# Check whether --with-iodp was given. +if test "${with_iodp+set}" = set; then : + withval=$with_iodp; +else + withval=no +fi + + +case $withval in + yes) + HAVE_IODP="yes" + for ac_header in iod_api.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "iod_api.h" "ac_cv_header_iod_api_h" "$ac_includes_default" +if test "x$ac_cv_header_iod_api_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IOD_API_H 1 +_ACEOF + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iod_initialize in -liod" >&5 +$as_echo_n "checking for iod_initialize in -liod... " >&6; } +if ${ac_cv_lib_iod_iod_initialize+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-liod $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char iod_initialize (); +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return iod_initialize (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_iod_iod_initialize=yes +else + ac_cv_lib_iod_iod_initialize=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iod_iod_initialize" >&5 +$as_echo "$ac_cv_lib_iod_iod_initialize" >&6; } +if test "x$ac_cv_lib_iod_iod_initialize" = xyes; then : + MYIOD_LIBS="-liod -lmdhim -lpbl" +else + unset HAVE_IODP +fi + + + if test -z "$HAVE_IODP" -a -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find iodp libraries" "$LINENO" 5 + fi + ;; + no) + HAVE_IODP="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iodp libraries" >&5 +$as_echo_n "checking for iodp libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5 +$as_echo "suppressed" >&6; } + ;; + *) + HAVE_IOD="yes" + case "$withval" in + *,*) + iod_inc="`echo $withval |cut -f1 -d,`" + iod_lib="`echo $withval |cut -f2 -d, -s`" + ;; + *) + if test -n "$withval"; then + iod_inc="$withval/include" + iod_lib="$withval/lib" pbl_inc="$withval/include" pbl_lib="$withval/lib" mdhim_inc="$withval/include" @@ -26569,8 +26780,8 @@ else fi - if test -z "$HAVE_IOD" -a -n "$HDF5_CONFIG_ABORT"; then - as_fn_error $? "couldn't find iod library" "$LINENO" 5 + if test -z "$HAVE_IODP" -a -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find iod libraries" "$LINENO" 5 fi ;; esac diff --git a/configure.ac b/configure.ac index caf8c36..7cde6ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1994,6 +1994,92 @@ 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. +## +AC_ARG_WITH([iodp], + [AS_HELP_STRING([--with-iodp=DIR], + [Use iodp [default=no]])],, + [withval=no]) + +case $withval in + yes) + HAVE_IODP="yes" + AC_CHECK_HEADERS([iod_api.h]) + AC_CHECK_LIB([iod], [iod_initialize],[MYIOD_LIBS="-liod -lmdhim -lpbl"], [unset HAVE_IODP]) + AC_SUBST([MYIODP_LIBS]) + if test -z "$HAVE_IODP" -a -n "$HDF5_CONFIG_ABORT"; then + AC_MSG_ERROR([couldn't find iodp libraries]) + fi + ;; + no) + HAVE_IODP="no" + AC_MSG_CHECKING([for iodp libraries]) + AC_MSG_RESULT([suppressed]) + ;; + *) + HAVE_IOD="yes" + case "$withval" in + *,*) + iod_inc="`echo $withval |cut -f1 -d,`" + iod_lib="`echo $withval |cut -f2 -d, -s`" + ;; + *) + if test -n "$withval"; then + iod_inc="$withval/include" + iod_lib="$withval/lib" + pbl_inc="$withval/include" + pbl_lib="$withval/lib" + mdhim_inc="$withval/include" + mdhim_lib="$withval/lib" + fi + ;; + esac + + ## Trying to include -I/usr/include and -L/usr/lib is redundant and + ## can mess some compilers up. + if test "X$iod_inc" = "X/usr/include"; then + iod_inc="" + fi + if test "X$iod_lib" = "X/usr/lib"; then + iod_lib="" + fi + + saved_CPPFLAGS="$CPPFLAGS" + saved_AM_CPPFLAGS="$AM_CPPFLAGS" + saved_LDFLAGS="$LDFLAGS" + saved_AM_LDFLAGS="$AM_LDFLAGS" + + if test -n "$iod_inc"; then + CPPFLAGS="$CPPFLAGS -I$iod_inc -I$mdhim_inc -I$pbl_inc" + AM_CPPFLAGS="$AM_CPPFLAGS -I$iod_inc -I$mdhim_inc -I$pbl_inc" + fi + + AC_CHECK_HEADERS([iod_api.h],,[CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"]) + + if test -n "$iod_lib"; then + LDFLAGS="$LDFLAGS -L$iod_lib -L$mdhim_lib -L$pbl_lib" + AM_LDFLAGS="$AM_LDFLAGS -L$iod_lib -L$mdhim_lib -L$pbl_lib" + fi + + AC_CHECK_LIB([pbl], [pbl_malloc],, + [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_IOD]) + AC_CHECK_LIB([mdhim], [mdhimFinalize],, + [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_IOD], + [-lpbl]) + AC_CHECK_LIB([iod], [iod_finalize],, + [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_IOD], + [-lmdhim -lpbl]) + + if test -z "$HAVE_IODP" -a -n "$HDF5_CONFIG_ABORT"; then + AC_MSG_ERROR([couldn't find iod libraries]) + fi + ;; +esac + +## ---------------------------------------------------------------------- ## Is the GNU zlib present? It has a header file `zlib.h' and a library ## `-lz' and their locations might be specified with the `--with-zlib' ## command-line switch. The value is an include path and/or a library path. diff --git a/examples/Makefile.in b/examples/Makefile.in index 084efd1..8a0b960 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -240,6 +240,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index d0fe7c7..7c61fc6 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -277,6 +277,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index d8fbfdc..6771bf7 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -248,6 +248,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 55961c1..1d6068f 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -367,6 +367,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 1dffd90..e2e6951 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -351,6 +351,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index e8941b1..bc397aa 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -275,6 +275,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 3bcfe24..adec89e 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -277,6 +277,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index e18276f..6e353a3 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -273,6 +273,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_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 215b083..5bd0839 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -239,6 +239,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_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 c702bfe..8bb959b 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -307,6 +307,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_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 205ee15..a2beb48 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -272,6 +272,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index afea448..9db7496 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -239,6 +239,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 6db7fc5..294c31c 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -277,6 +277,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_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 18fdf27..6d749fd 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -240,6 +240,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_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 35a3568..44c9e57 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -323,6 +323,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_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 27fe0a0..ba8cb6f 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -286,6 +286,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index d932c1c..d64478a 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -306,6 +306,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index c1bfb0e..7e1457c 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -313,6 +313,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 20432a6..ebebf94 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -274,6 +274,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_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 9d999d5..8dc4c7a 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -288,6 +288,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 609b2b1..0f5e92a 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -314,6 +314,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/src/Makefile.in b/src/Makefile.in index 363a65f..dc352ff 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -376,6 +376,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/test/Makefile.in b/test/Makefile.in index 698df14..4443389 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -706,6 +706,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index adf9a3a..ae8aa41 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -301,6 +301,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 68bd506..a89db3e 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -274,6 +274,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 679cf63..9a7ef0d 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -280,6 +280,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index e30ef1d..68aa458 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -287,6 +287,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index d535a24..1c758d8 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -282,6 +282,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 9bea885..10118a0 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -280,6 +280,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 5bc9869..1c421fa 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -294,6 +294,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index b348472..f9738be 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -274,6 +274,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index bf2f909..361444b 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -330,6 +330,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 54b639c..dfee76a 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -309,6 +309,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 579303d..12577af 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -272,6 +272,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index ea9b81b..5a7c17a 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -334,6 +334,7 @@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ |