diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-03-10 20:26:18 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-03-10 20:26:18 (GMT) |
| commit | 0ed93555aef7459b2a7ddaaac84f3186ea6bac9d (patch) | |
| tree | c213256fb2b039a79bd640636054605765d78b8a | |
| parent | e551fef9e304f3c72624bc58ba582a0bb0da931f (diff) | |
| download | hdf5-0ed93555aef7459b2a7ddaaac84f3186ea6bac9d.zip hdf5-0ed93555aef7459b2a7ddaaac84f3186ea6bac9d.tar.gz hdf5-0ed93555aef7459b2a7ddaaac84f3186ea6bac9d.tar.bz2 | |
[svn-r24778] run reconfigure with new configure.ac changes.
43 files changed, 100 insertions, 100 deletions
diff --git a/Makefile.in b/Makefile.in index 21705ed..d613737 100644 --- a/Makefile.in +++ b/Makefile.in @@ -306,7 +306,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/Makefile.in b/c++/Makefile.in index 2e53a6f..60f3c26 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -271,7 +271,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 639aed4..1c5a6f7 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -238,7 +238,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index f7a501d..2cbd54d 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -314,7 +314,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 51e2efb..927cd43 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -274,7 +274,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ @@ -710,7 +710,7 @@ LL_PATH USE_FILTER_SZIP USE_FILTER_DEFLATE MYIOD_LIBS -MYDAOS_POSIX_LIBS +MYDAOS_LIBS MYPLFS_LIBS MYAXE_LIBS AM_MAKEFLAGS @@ -937,7 +937,7 @@ with_fnord with_dmalloc with_axe with_plfs -with_daos_posix +with_daos with_iod with_zlib with_szlib @@ -1709,7 +1709,7 @@ Optional Packages: --with-dmalloc=DIR Use dmalloc memory debugging aid [default=no] --with-axe=DIR Use axe [default=no] --with-plfs=DIR Use plfs [default=no] - --with-daos-posix=DIR Use daos_posix [default=no] + --with-daos=DIR Use daos [default=no] --with-iod=DIR Use iod [default=no] --with-zlib=DIR Use zlib library for external deflate I/O filter [default=yes] @@ -26041,15 +26041,15 @@ fi esac ## ---------------------------------------------------------------------- -## Is the daos_posix present? It has a header file `daos_posix.h' and a library -## `-ldaos_posix' and their locations might be specified with the `--with-daos_posix' +## Is the daos present? It has a header file `daos.h' and a library +## `-ldaos' and their locations might be specified with the `--with-daos' ## 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-daos_posix was given. -if test "${with_daos_posix+set}" = set; then : - withval=$with_daos_posix; +# Check whether --with-daos was given. +if test "${with_daos+set}" = set; then : + withval=$with_daos; else withval=no fi @@ -26057,7 +26057,7 @@ fi case $withval in yes) - HAVE_DAOS_POSIX="yes" + HAVE_DAOS="yes" for ac_header in daos_api.h daos_types.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -26071,13 +26071,13 @@ fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daos_posix_init in -ldaos_posix" >&5 -$as_echo_n "checking for daos_posix_init in -ldaos_posix... " >&6; } -if ${ac_cv_lib_daos_posix_daos_posix_init+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daos_init in -ldaos" >&5 +$as_echo_n "checking for daos_init in -ldaos... " >&6; } +if ${ac_cv_lib_daos_daos_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldaos_posix $LIBS" +LIBS="-ldaos $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26087,7 +26087,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char daos_posix_init (); +char daos_init (); #ifdef FC_DUMMY_MAIN #ifndef FC_DUMMY_MAIN_EQ_F77 # ifdef __cplusplus @@ -26099,62 +26099,62 @@ char daos_posix_init (); int main () { -return daos_posix_init (); +return daos_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_daos_posix_daos_posix_init=yes + ac_cv_lib_daos_daos_init=yes else - ac_cv_lib_daos_posix_daos_posix_init=no + ac_cv_lib_daos_daos_init=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_daos_posix_daos_posix_init" >&5 -$as_echo "$ac_cv_lib_daos_posix_daos_posix_init" >&6; } -if test "x$ac_cv_lib_daos_posix_daos_posix_init" = xyes; then : - MYDAOS_POSIX_LIBS='-ldaos_posix' +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_daos_daos_init" >&5 +$as_echo "$ac_cv_lib_daos_daos_init" >&6; } +if test "x$ac_cv_lib_daos_daos_init" = xyes; then : + MYDAOS_LIBS='-ldaos' else - unset HAVE_DAOS_POSIX + unset HAVE_DAOS fi - if test -z "$HAVE_DAOS_POSIX" -a -n "$HDF5_CONFIG_ABORT"; then - as_fn_error $? "couldn't find daos_posix library" "$LINENO" 5 + if test -z "$HAVE_DAOS" -a -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find daos library" "$LINENO" 5 fi ;; no) HAVE_DAOS_POSIX="no" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daos_posix library" >&5 -$as_echo_n "checking for daos_posix library... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daos library" >&5 +$as_echo_n "checking for daos library... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5 $as_echo "suppressed" >&6; } ;; *) - HAVE_DAOS_POSIX="yes" + HAVE_DAOS="yes" case "$withval" in *,*) - daos_posix_inc="`echo $withval |cut -f1 -d,`" - daos_posix_lib="`echo $withval |cut -f2 -d, -s`" + daos_inc="`echo $withval |cut -f1 -d,`" + daos_lib="`echo $withval |cut -f2 -d, -s`" ;; *) if test -n "$withval"; then - daos_posix_inc="$withval" - daos_posix_lib="$withval/lib" + daos_inc="$withval/include/" + daos_lib="$withval/lib64" fi ;; esac ## Trying to include -I/usr/include and -L/usr/lib is redundant and ## can mess some compilers up. - if test "X$daos_posix_inc" = "X/usr/include"; then - daos_posix_inc="" + if test "X$daos_inc" = "X/usr/include"; then + daos_inc="" fi - if test "X$daos_posix_lib" = "X/usr/lib"; then - daos_posix_lib="" + if test "X$daos_lib" = "X/usr/lib"; then + daos_lib="" fi saved_CPPFLAGS="$CPPFLAGS" @@ -26162,9 +26162,9 @@ $as_echo "suppressed" >&6; } saved_LDFLAGS="$LDFLAGS" saved_AM_LDFLAGS="$AM_LDFLAGS" - if test -n "$daos_posix_inc"; then - CPPFLAGS="$CPPFLAGS -I$daos_posix_inc" - AM_CPPFLAGS="$AM_CPPFLAGS -I$daos_posix_inc" + if test -n "$daos_inc"; then + CPPFLAGS="$CPPFLAGS -I$daos_inc" + AM_CPPFLAGS="$AM_CPPFLAGS -I$daos_inc" fi for ac_header in daos_api.h @@ -26182,18 +26182,18 @@ fi done - if test -n "$daos_posix_lib"; then - LDFLAGS="$LDFLAGS -L$daos_posix_lib" - AM_LDFLAGS="$AM_LDFLAGS -L$daos_posix_lib" + if test -n "$daos_lib"; then + LDFLAGS="$LDFLAGS -L$daos_lib" + AM_LDFLAGS="$AM_LDFLAGS -L$daos_lib" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daos_posix_finalize in -ldaos_posix" >&5 -$as_echo_n "checking for daos_posix_finalize in -ldaos_posix... " >&6; } -if ${ac_cv_lib_daos_posix_daos_posix_finalize+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daos_container_close in -ldaos" >&5 +$as_echo_n "checking for daos_container_close in -ldaos... " >&6; } +if ${ac_cv_lib_daos_daos_container_close+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldaos_posix $LIBS" +LIBS="-ldaos $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26203,7 +26203,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char daos_posix_finalize (); +char daos_container_close (); #ifdef FC_DUMMY_MAIN #ifndef FC_DUMMY_MAIN_EQ_F77 # ifdef __cplusplus @@ -26215,36 +26215,36 @@ char daos_posix_finalize (); int main () { -return daos_posix_finalize (); +return daos_container_close (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_daos_posix_daos_posix_finalize=yes + ac_cv_lib_daos_daos_container_close=yes else - ac_cv_lib_daos_posix_daos_posix_finalize=no + ac_cv_lib_daos_daos_container_close=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_daos_posix_daos_posix_finalize" >&5 -$as_echo "$ac_cv_lib_daos_posix_daos_posix_finalize" >&6; } -if test "x$ac_cv_lib_daos_posix_daos_posix_finalize" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_daos_daos_container_close" >&5 +$as_echo "$ac_cv_lib_daos_daos_container_close" >&6; } +if test "x$ac_cv_lib_daos_daos_container_close" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDAOS_POSIX 1 +#define HAVE_LIBDAOS 1 _ACEOF - LIBS="-ldaos_posix $LIBS" + LIBS="-ldaos $LIBS" else - LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_DAOS_POSIX + LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_DAOS fi - if test -z "$HAVE_DAOS_POSIX" -a -n "$HDF5_CONFIG_ABORT"; then - as_fn_error $? "couldn't find daos_posix library" "$LINENO" 5 + if test -z "$HAVE_DAOS" -a -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find daos library" "$LINENO" 5 fi ;; esac diff --git a/examples/Makefile.in b/examples/Makefile.in index 6cf527e..890a7c1 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -238,7 +238,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 723bb89..d474e96 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -275,7 +275,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 209d8a1..dd2637d 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -246,7 +246,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 48d0ddf..981bb1a 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -365,7 +365,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 79caff0..02cadfc 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -349,7 +349,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index c7291e8..42dbd80 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -273,7 +273,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 5917103..db9491b 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -275,7 +275,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index f9055de..1a97a80 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -271,7 +271,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_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 12956a6..6132e12 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -237,7 +237,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_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 aa5ec0a..e41efb2 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -305,7 +305,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_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 b3def4a..c4a353a 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -270,7 +270,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index b60e7df..e0e8548 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -237,7 +237,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 5b464da..717c034 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -275,7 +275,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_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 c783d4d..2a7367c 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -238,7 +238,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_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 b70a4c9..c3c52cf 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -321,7 +321,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_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 9697cd3..444b3f3 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -284,7 +284,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 4e4a3c8..13fa32d 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -304,7 +304,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 20c35cf..1822c2e 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -311,7 +311,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index a384385..4e9d1b4 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -272,7 +272,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_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 188ef30..83d5731 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -286,7 +286,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 99a3d18..185d3bc 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -312,7 +312,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ @@ -284,7 +284,7 @@ H5Fclose_ff(hid_t file_id, hbool_t persist_flag, hid_t estack_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ii", file_id, estack_id); + H5TRACE3("e", "ibi", file_id, persist_flag, estack_id); /* If persist flag is FALSE (non-default), then set that flag in the file struct */ if(FALSE == persist_flag) { diff --git a/src/H5config.h.in b/src/H5config.h.in index d99c709..9890301 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -214,8 +214,8 @@ /* Define to 1 if you have the `axe' library (-laxe). */ #undef HAVE_LIBAXE -/* Define to 1 if you have the `daos_posix' library (-ldaos_posix). */ -#undef HAVE_LIBDAOS_POSIX +/* Define to 1 if you have the `daos' library (-ldaos). */ +#undef HAVE_LIBDAOS /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL diff --git a/src/Makefile.in b/src/Makefile.in index 854edbf..b2048ae 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -373,7 +373,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/test/Makefile.in b/test/Makefile.in index 692172e..594161d 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -704,7 +704,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index abc11f4..8a7462b 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -299,7 +299,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 2077693..0806dab 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -272,7 +272,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 2cce475..727c92b 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -278,7 +278,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 7a9bc51..ae5acae 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -285,7 +285,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 10654a1..81997f7 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -280,7 +280,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index e4cf158..673238a 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -278,7 +278,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 8d7506b..02f2f24 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -292,7 +292,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 7961c93..ba9b2b1 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -272,7 +272,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 7a71868..83ae08c 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -328,7 +328,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 6cc1580..bd8a6a3 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -307,7 +307,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 1e7d19c..24b2f78 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -270,7 +270,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 97a2d1d..cbc3557 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -332,7 +332,7 @@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYAXE_LIBS = @MYAXE_LIBS@ -MYDAOS_POSIX_LIBS = @MYDAOS_POSIX_LIBS@ +MYDAOS_LIBS = @MYDAOS_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ NM = @NM@ |