diff options
41 files changed, 92 insertions, 7804 deletions
@@ -1181,8 +1181,6 @@ ./src/H5FDcore.h ./src/H5FDfamily.c ./src/H5FDfamily.h -./src/H5FDgass.c -./src/H5FDgass.h ./src/H5FDlog.c ./src/H5FDlog.h ./src/H5FDmpi.c @@ -1197,8 +1195,6 @@ ./src/H5FDpublic.h ./src/H5FDsec2.c ./src/H5FDsec2.h -./src/H5FDsrb.c -./src/H5FDsrb.h ./src/H5FDstdio.c ./src/H5FDstdio.h ./src/H5FL.c @@ -1354,9 +1350,6 @@ ./test/fillval.c ./test/flush1.c ./test/flush2.c -./test/gass_append.c -./test/gass_read.c -./test/gass_write.c ./test/gen_deflate.c _DO_NOT_DISTRIBUTE_ ./test/gen_mergemsg.c _DO_NOT_DISTRIBUTE_ ./test/gen_old_array.c _DO_NOT_DISTRIBUTE_ @@ -1387,9 +1380,6 @@ ./test/reserved.c ./test/set_extent.c ./test/space_overflow.c _DO_NOT_DISTRIBUTE_ -./test/srb_append.c -./test/srb_read.c -./test/srb_write.c ./test/stab.c ./test/tarray.c ./test/tarrold.h5 diff --git a/c++/configure b/c++/configure index 5638382..55bc3fb 100755 --- a/c++/configure +++ b/c++/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From c++/configure.in Id: configure.in 15620 2008-09-14 19:55:08Z hdftest . +# From c++/configure.in Id: configure.in 15670 2008-09-21 22:12:24Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 C++ 1.6.7-snap20. # @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 15620 2008-09-14 19:55:08Z hdftest . +# From configure.in Id: configure.in 15670 2008-09-21 22:12:24Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.6.7-snap20. # @@ -856,11 +856,6 @@ EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP -SSL -GASS -TESTGASS -SRB -TESTSRB PTHREAD DEBUG_PKG TRACE_API @@ -1535,9 +1530,6 @@ Optional Packages: [default=yes] --with-szlib=DIR Use szlib library for external szlib I/O filter [default=no] - --with-ssl=LIB Use the SSL library [default=no] - --with-gass=DIR Use the GASS library [default=no] - --with-srb=DIR Use the SRB library [default=no] --with-pthread=DIR Use the Pthreads library [default=no] --with-mpe=DIR Use MPE instrumentation [default=no] @@ -5280,7 +5272,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5283 "configure"' > conftest.$ac_ext + echo '#line 5275 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5837,7 +5829,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5832: \"$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 @@ -7712,7 +7704,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7715 "configure" +#line 7707 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7810,7 +7802,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7813 "configure" +#line 7805 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -27732,3788 +27724,6 @@ echo "${ECHO_T}shared szlib library cannot be linked. disabling szip. use static fi - SSL=yes - -# Check whether --with-ssl was given. -if test "${with_ssl+set}" = set; then - withval=$with_ssl; -else - withval=no -fi - - -case "$withval" in - yes) - -{ echo "$as_me:$LINENO: checking for main in -lcrypto" >&5 -echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6; } -if test "${ac_cv_lib_crypto_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_crypto_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_crypto_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5 -echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6; } -if test $ac_cv_lib_crypto_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPTO 1 -_ACEOF - - LIBS="-lcrypto $LIBS" - -else - unset SSL -fi - - -{ echo "$as_me:$LINENO: checking for SSL_get_version in -lssl" >&5 -echo $ECHO_N "checking for SSL_get_version in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_SSL_get_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 SSL_get_version (); -int -main () -{ -return SSL_get_version (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ssl_SSL_get_version=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ssl_SSL_get_version=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_get_version" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_get_version" >&6; } -if test $ac_cv_lib_ssl_SSL_get_version = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSSL 1 -_ACEOF - - LIBS="-lssl $LIBS" - -else - unset SSL -fi - - ;; - no) - { echo "$as_me:$LINENO: checking for SSL" >&5 -echo $ECHO_N "checking for SSL... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: suppressed" >&5 -echo "${ECHO_T}suppressed" >&6; } - unset SSL - ;; - *) - saved_LDFLAGS="$LDFLAGS" - if test "X$with_ssl" != "X/usr/lib"; then - LDFLAGS="$LDFLAGS -L$with_ssl" - fi - -{ echo "$as_me:$LINENO: checking for main in -lcrypto" >&5 -echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6; } -if test "${ac_cv_lib_crypto_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_crypto_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_crypto_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5 -echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6; } -if test $ac_cv_lib_crypto_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPTO 1 -_ACEOF - - LIBS="-lcrypto $LIBS" - -else - LDFLAGS="$saved_LDFLAGS"; unset SSL -fi - - -{ echo "$as_me:$LINENO: checking for SSL_get_version in -lssl" >&5 -echo $ECHO_N "checking for SSL_get_version in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_SSL_get_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 SSL_get_version (); -int -main () -{ -return SSL_get_version (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ssl_SSL_get_version=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ssl_SSL_get_version=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_get_version" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_get_version" >&6; } -if test $ac_cv_lib_ssl_SSL_get_version = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSSL 1 -_ACEOF - - LIBS="-lssl $LIBS" - -else - LDFLAGS="$saved_LDFLAGS"; unset SSL -fi - - ;; -esac - - GASS="yes" - TESTGASS='$(srcdir)/testgass' - -# Check whether --with-gass was given. -if test "${with_gass+set}" = set; then - withval=$with_gass; -else - withval=no -fi - - -case "$withval" in - yes) - -for ac_header in globus_common.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to help@hdfgroup.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - unset GASS TESTGASS -fi - -done - - -{ echo "$as_me:$LINENO: checking for globus_module_activate in -lglobus_common" >&5 -echo $ECHO_N "checking for globus_module_activate in -lglobus_common... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_common_globus_module_activate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_common $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 globus_module_activate (); -int -main () -{ -return globus_module_activate (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_common_globus_module_activate=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_common_globus_module_activate=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_common_globus_module_activate" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_common_globus_module_activate" >&6; } -if test $ac_cv_lib_globus_common_globus_module_activate = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_COMMON 1 -_ACEOF - - LIBS="-lglobus_common $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_cache" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_cache... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_cache_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_cache $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_cache_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_cache_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_cache_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_cache_main" >&6; } -if test $ac_cv_lib_globus_gass_cache_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_CACHE 1 -_ACEOF - - LIBS="-lglobus_gass_cache $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gaa" >&5 -echo $ECHO_N "checking for main in -lglobus_gaa... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gaa_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gaa $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gaa_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gaa_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gaa_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gaa_main" >&6; } -if test $ac_cv_lib_globus_gaa_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GAA 1 -_ACEOF - - LIBS="-lglobus_gaa $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gss" >&5 -echo $ECHO_N "checking for main in -lglobus_gss... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gss_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gss $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gss_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gss_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gss_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gss_main" >&6; } -if test $ac_cv_lib_globus_gss_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GSS 1 -_ACEOF - - LIBS="-lglobus_gss $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gss_assist" >&5 -echo $ECHO_N "checking for main in -lglobus_gss_assist... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gss_assist_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gss_assist $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gss_assist_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gss_assist_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gss_assist_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gss_assist_main" >&6; } -if test $ac_cv_lib_globus_gss_assist_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GSS_ASSIST 1 -_ACEOF - - LIBS="-lglobus_gss_assist $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_io" >&5 -echo $ECHO_N "checking for main in -lglobus_io... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_io_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_io $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_io_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_io_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_io_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_io_main" >&6; } -if test $ac_cv_lib_globus_io_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_IO 1 -_ACEOF - - LIBS="-lglobus_io $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_transfer_assist" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_transfer_assist... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_transfer_assist_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_transfer_assist $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_transfer_assist_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_transfer_assist_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_transfer_assist_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_transfer_assist_main" >&6; } -if test $ac_cv_lib_globus_gass_transfer_assist_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_TRANSFER_ASSIST 1 -_ACEOF - - LIBS="-lglobus_gass_transfer_assist $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_transfer" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_transfer... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_transfer_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_transfer $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_transfer_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_transfer_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_transfer_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_transfer_main" >&6; } -if test $ac_cv_lib_globus_gass_transfer_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_TRANSFER 1 -_ACEOF - - LIBS="-lglobus_gass_transfer $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for globus_gass_open in -lglobus_gass_file" >&5 -echo $ECHO_N "checking for globus_gass_open in -lglobus_gass_file... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_file_globus_gass_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_file $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 globus_gass_open (); -int -main () -{ -return globus_gass_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_file_globus_gass_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_file_globus_gass_open=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_file_globus_gass_open" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_file_globus_gass_open" >&6; } -if test $ac_cv_lib_globus_gass_file_globus_gass_open = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_FILE 1 -_ACEOF - - LIBS="-lglobus_gass_file $LIBS" - -else - unset GASS TESTGASS -fi - - ;; - no) - { echo "$as_me:$LINENO: checking for GASS" >&5 -echo $ECHO_N "checking for GASS... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: suppressed" >&5 -echo "${ECHO_T}suppressed" >&6; } - unset GASS TESTGASS - ;; - *) - case "$withval" in - *,*) - gass_inc="`echo $withval | cut -f1 -d,`" - gass_lib="`echo $withval | cut -f2 -d, -s`" - ;; - *) - if test -n "$withval"; then - gass_inc="$withval/include" - gass_lib="$withval/lib" - fi - ;; - esac - - if test "X$gass_inc" = "X/usr/include"; then - gass_inc="" - fi - if test "X$gass_lib" = "X/usr/lib"; then - gass_lib="" - fi - - if test -n "$gass_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gass_inc" - -for ac_header in globus_common.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to help@hdfgroup.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - CPPFLAGS="$saved_CPPFLAGS" - unset GASS TESTGASS -fi - -done - - else - -for ac_header in globus_common.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to help@hdfgroup.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - fi - - if test -n "$gass_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gass_lib" - -{ echo "$as_me:$LINENO: checking for globus_module_activate in -lglobus_common" >&5 -echo $ECHO_N "checking for globus_module_activate in -lglobus_common... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_common_globus_module_activate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_common $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 globus_module_activate (); -int -main () -{ -return globus_module_activate (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_common_globus_module_activate=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_common_globus_module_activate=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_common_globus_module_activate" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_common_globus_module_activate" >&6; } -if test $ac_cv_lib_globus_common_globus_module_activate = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_COMMON 1 -_ACEOF - - LIBS="-lglobus_common $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_cache" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_cache... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_cache_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_cache $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_cache_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_cache_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_cache_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_cache_main" >&6; } -if test $ac_cv_lib_globus_gass_cache_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_CACHE 1 -_ACEOF - - LIBS="-lglobus_gass_cache $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gaa" >&5 -echo $ECHO_N "checking for main in -lglobus_gaa... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gaa_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gaa $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gaa_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gaa_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gaa_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gaa_main" >&6; } -if test $ac_cv_lib_globus_gaa_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GAA 1 -_ACEOF - - LIBS="-lglobus_gaa $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gss" >&5 -echo $ECHO_N "checking for main in -lglobus_gss... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gss_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gss $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gss_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gss_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gss_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gss_main" >&6; } -if test $ac_cv_lib_globus_gss_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GSS 1 -_ACEOF - - LIBS="-lglobus_gss $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gss_assist" >&5 -echo $ECHO_N "checking for main in -lglobus_gss_assist... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gss_assist_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gss_assist $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gss_assist_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gss_assist_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gss_assist_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gss_assist_main" >&6; } -if test $ac_cv_lib_globus_gss_assist_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GSS_ASSIST 1 -_ACEOF - - LIBS="-lglobus_gss_assist $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_io" >&5 -echo $ECHO_N "checking for main in -lglobus_io... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_io_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_io $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_io_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_io_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_io_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_io_main" >&6; } -if test $ac_cv_lib_globus_io_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_IO 1 -_ACEOF - - LIBS="-lglobus_io $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_transfer_assist" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_transfer_assist... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_transfer_assist_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_transfer_assist $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_transfer_assist_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_transfer_assist_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_transfer_assist_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_transfer_assist_main" >&6; } -if test $ac_cv_lib_globus_gass_transfer_assist_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_TRANSFER_ASSIST 1 -_ACEOF - - LIBS="-lglobus_gass_transfer_assist $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_transfer" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_transfer... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_transfer_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_transfer $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_transfer_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_transfer_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_transfer_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_transfer_main" >&6; } -if test $ac_cv_lib_globus_gass_transfer_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_TRANSFER 1 -_ACEOF - - LIBS="-lglobus_gass_transfer $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for globus_gass_open in -lglobus_gass_file" >&5 -echo $ECHO_N "checking for globus_gass_open in -lglobus_gass_file... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_file_globus_gass_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_file $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 globus_gass_open (); -int -main () -{ -return globus_gass_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_file_globus_gass_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_file_globus_gass_open=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_file_globus_gass_open" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_file_globus_gass_open" >&6; } -if test $ac_cv_lib_globus_gass_file_globus_gass_open = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_FILE 1 -_ACEOF - - LIBS="-lglobus_gass_file $LIBS" - -else - unset GASS TESTGASS -fi - - else - -{ echo "$as_me:$LINENO: checking for globus_module_activate in -lglobus_common" >&5 -echo $ECHO_N "checking for globus_module_activate in -lglobus_common... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_common_globus_module_activate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_common $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 globus_module_activate (); -int -main () -{ -return globus_module_activate (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_common_globus_module_activate=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_common_globus_module_activate=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_common_globus_module_activate" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_common_globus_module_activate" >&6; } -if test $ac_cv_lib_globus_common_globus_module_activate = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_COMMON 1 -_ACEOF - - LIBS="-lglobus_common $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_cache" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_cache... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_cache_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_cache $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_cache_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_cache_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_cache_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_cache_main" >&6; } -if test $ac_cv_lib_globus_gass_cache_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_CACHE 1 -_ACEOF - - LIBS="-lglobus_gass_cache $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gaa" >&5 -echo $ECHO_N "checking for main in -lglobus_gaa... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gaa_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gaa $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gaa_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gaa_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gaa_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gaa_main" >&6; } -if test $ac_cv_lib_globus_gaa_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GAA 1 -_ACEOF - - LIBS="-lglobus_gaa $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gss" >&5 -echo $ECHO_N "checking for main in -lglobus_gss... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gss_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gss $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gss_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gss_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gss_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gss_main" >&6; } -if test $ac_cv_lib_globus_gss_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GSS 1 -_ACEOF - - LIBS="-lglobus_gss $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gss_assist" >&5 -echo $ECHO_N "checking for main in -lglobus_gss_assist... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gss_assist_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gss_assist $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gss_assist_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gss_assist_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gss_assist_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gss_assist_main" >&6; } -if test $ac_cv_lib_globus_gss_assist_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GSS_ASSIST 1 -_ACEOF - - LIBS="-lglobus_gss_assist $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_io" >&5 -echo $ECHO_N "checking for main in -lglobus_io... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_io_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_io $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_io_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_io_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_io_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_io_main" >&6; } -if test $ac_cv_lib_globus_io_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_IO 1 -_ACEOF - - LIBS="-lglobus_io $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_transfer_assist" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_transfer_assist... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_transfer_assist_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_transfer_assist $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_transfer_assist_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_transfer_assist_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_transfer_assist_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_transfer_assist_main" >&6; } -if test $ac_cv_lib_globus_gass_transfer_assist_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_TRANSFER_ASSIST 1 -_ACEOF - - LIBS="-lglobus_gass_transfer_assist $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for main in -lglobus_gass_transfer" >&5 -echo $ECHO_N "checking for main in -lglobus_gass_transfer... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_transfer_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_transfer $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_transfer_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_transfer_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_transfer_main" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_transfer_main" >&6; } -if test $ac_cv_lib_globus_gass_transfer_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_TRANSFER 1 -_ACEOF - - LIBS="-lglobus_gass_transfer $LIBS" - -else - unset GASS TESTGASS -fi - - -{ echo "$as_me:$LINENO: checking for globus_gass_open in -lglobus_gass_file" >&5 -echo $ECHO_N "checking for globus_gass_open in -lglobus_gass_file... $ECHO_C" >&6; } -if test "${ac_cv_lib_globus_gass_file_globus_gass_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglobus_gass_file $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 globus_gass_open (); -int -main () -{ -return globus_gass_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_globus_gass_file_globus_gass_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_globus_gass_file_globus_gass_open=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_globus_gass_file_globus_gass_open" >&5 -echo "${ECHO_T}$ac_cv_lib_globus_gass_file_globus_gass_open" >&6; } -if test $ac_cv_lib_globus_gass_file_globus_gass_open = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLOBUS_GASS_FILE 1 -_ACEOF - - LIBS="-lglobus_gass_file $LIBS" - -else - unset GASS TESTGASS -fi - - fi - ;; -esac - -if test -n "$GASS"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GASS 1 -_ACEOF - -fi - - SRB="yes" - TESTSRB='$(srcdir)/testsrb' - -# Check whether --with-srb was given. -if test "${with_srb+set}" = set; then - withval=$with_srb; -else - withval=no -fi - - -case "$withval" in - yes) - -for ac_header in srbClient.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to help@hdfgroup.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - unset SRB TESTSRB -fi - -done - - -{ echo "$as_me:$LINENO: checking for main in -lelf" >&5 -echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6; } -if test "${ac_cv_lib_elf_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lelf $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_elf_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_elf_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 -echo "${ECHO_T}$ac_cv_lib_elf_main" >&6; } -if test $ac_cv_lib_elf_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBELF 1 -_ACEOF - - LIBS="-lelf $LIBS" - -else - unset SRB TESTSRB -fi - - -{ echo "$as_me:$LINENO: checking for main in -lsocket" >&5 -echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_main" >&6; } -if test $ac_cv_lib_socket_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF - - LIBS="-lsocket $LIBS" - -else - unset SRB TESTSRB -fi - - -{ echo "$as_me:$LINENO: checking for clConnect in -lSrbClient" >&5 -echo $ECHO_N "checking for clConnect in -lSrbClient... $ECHO_C" >&6; } -if test "${ac_cv_lib_SrbClient_clConnect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lSrbClient $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 clConnect (); -int -main () -{ -return clConnect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_SrbClient_clConnect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_SrbClient_clConnect=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_SrbClient_clConnect" >&5 -echo "${ECHO_T}$ac_cv_lib_SrbClient_clConnect" >&6; } -if test $ac_cv_lib_SrbClient_clConnect = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSRBCLIENT 1 -_ACEOF - - LIBS="-lSrbClient $LIBS" - -else - unset SRB TESTSRB -fi - - ;; - no) - { echo "$as_me:$LINENO: checking for SRB" >&5 -echo $ECHO_N "checking for SRB... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: suppressed" >&5 -echo "${ECHO_T}suppressed" >&6; } - unset SRB TESTSRB - ;; - *) - case "$withval" in - *,*) - srb_inc="`echo $withval | cut -f1 -d,`" - srb_lib="`echo $withval | cut -f2 -d, -s`" - ;; - *) - if test -n "$withval"; then - srb_inc="$withval/include" - srb_lib="$withval/lib" - fi - ;; - esac - - if test "X$srb_inc" = "X/usr/include"; then - srb_inc="" - fi - if test "X$srb_lib" = "X/usr/lib"; then - srb_lib="" - fi - - if test -n "$srb_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$srb_inc" - -for ac_header in srbClient.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to help@hdfgroup.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - CPPFLAGS="$saved_CPPFLAGS" - unset SRB TESTSRB -fi - -done - - else - -for ac_header in srbClient.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to help@hdfgroup.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - fi - - if test -n "$srb_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$srb_lib" - -{ echo "$as_me:$LINENO: checking for main in -lelf" >&5 -echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6; } -if test "${ac_cv_lib_elf_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lelf $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_elf_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_elf_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 -echo "${ECHO_T}$ac_cv_lib_elf_main" >&6; } -if test $ac_cv_lib_elf_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBELF 1 -_ACEOF - - LIBS="-lelf $LIBS" - -else - unset SRB TESTSRB -fi - - -{ echo "$as_me:$LINENO: checking for main in -lsocket" >&5 -echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_main" >&6; } -if test $ac_cv_lib_socket_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF - - LIBS="-lsocket $LIBS" - -else - unset SRB TESTSRB -fi - - -{ echo "$as_me:$LINENO: checking for clConnect in -lSrbClient" >&5 -echo $ECHO_N "checking for clConnect in -lSrbClient... $ECHO_C" >&6; } -if test "${ac_cv_lib_SrbClient_clConnect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lSrbClient $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 clConnect (); -int -main () -{ -return clConnect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_SrbClient_clConnect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_SrbClient_clConnect=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_SrbClient_clConnect" >&5 -echo "${ECHO_T}$ac_cv_lib_SrbClient_clConnect" >&6; } -if test $ac_cv_lib_SrbClient_clConnect = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSRBCLIENT 1 -_ACEOF - - LIBS="-lSrbClient $LIBS" - -else - unset SRB TESTSRB -fi - - else - -{ echo "$as_me:$LINENO: checking for main in -lelf" >&5 -echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6; } -if test "${ac_cv_lib_elf_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lelf $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_elf_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_elf_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 -echo "${ECHO_T}$ac_cv_lib_elf_main" >&6; } -if test $ac_cv_lib_elf_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBELF 1 -_ACEOF - - LIBS="-lelf $LIBS" - -else - unset SRB TESTSRB -fi - - -{ echo "$as_me:$LINENO: checking for main in -lsocket" >&5 -echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_main" >&6; } -if test $ac_cv_lib_socket_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF - - LIBS="-lsocket $LIBS" - -else - unset SRB TESTSRB -fi - - -{ echo "$as_me:$LINENO: checking for clConnect in -lSrbClient" >&5 -echo $ECHO_N "checking for clConnect in -lSrbClient... $ECHO_C" >&6; } -if test "${ac_cv_lib_SrbClient_clConnect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lSrbClient $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 clConnect (); -int -main () -{ -return clConnect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_SrbClient_clConnect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_SrbClient_clConnect=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_SrbClient_clConnect" >&5 -echo "${ECHO_T}$ac_cv_lib_SrbClient_clConnect" >&6; } -if test $ac_cv_lib_SrbClient_clConnect = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSRBCLIENT 1 -_ACEOF - - LIBS="-lSrbClient $LIBS" - -else - unset SRB TESTSRB -fi - - fi - ;; -esac - -if test -n "$SRB"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SRB 1 -_ACEOF - -fi - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -37150,14 +33360,14 @@ EGREP!$EGREP$ac_delim LIBTOOL!$LIBTOOL$ac_delim USE_FILTER_DEFLATE!$USE_FILTER_DEFLATE$ac_delim USE_FILTER_SZIP!$USE_FILTER_SZIP$ac_delim -SSL!$SSL$ac_delim -GASS!$GASS$ac_delim -TESTGASS!$TESTGASS$ac_delim -SRB!$SRB$ac_delim -TESTSRB!$TESTSRB$ac_delim PTHREAD!$PTHREAD$ac_delim DEBUG_PKG!$DEBUG_PKG$ac_delim TRACE_API!$TRACE_API$ac_delim +INSTRUMENT_LIBRARY!$INSTRUMENT_LIBRARY$ac_delim +CLEARFILEBUF!$CLEARFILEBUF$ac_delim +MPE!$MPE$ac_delim +MPI_GET_SIZE!$MPI_GET_SIZE$ac_delim +FILTERS!$FILTERS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then @@ -37211,11 +33421,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -INSTRUMENT_LIBRARY!$INSTRUMENT_LIBRARY$ac_delim -CLEARFILEBUF!$CLEARFILEBUF$ac_delim -MPE!$MPE$ac_delim -MPI_GET_SIZE!$MPI_GET_SIZE$ac_delim -FILTERS!$FILTERS$ac_delim USE_FILTER_SHUFFLE!$USE_FILTER_SHUFFLE$ac_delim USE_FILTER_FLETCHER32!$USE_FILTER_FLETCHER32$ac_delim H5_VERSION!$H5_VERSION$ac_delim @@ -37235,7 +33440,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -38022,9 +34227,6 @@ IF_YES_NO "$HAVE_DMALLOC" PRINT_N " Function Stack Tracing" IF_ENABLED_DISABLED "$FUNCSTACK" -PRINT_N " GASS" -IF_YES_NO "$GASS" - PRINT_N " GPFS" IF_YES_NO "$GPFS" @@ -38054,9 +34256,6 @@ else PRINT "No" fi -PRINT_N " SRB" -IF_YES_NO "$SRB" - PRINT_N " Threadsafety" IF_ENABLED_DISABLED "$THREADSAFE" diff --git a/configure.in b/configure.in index 14964a6..c5da9a6 100644 --- a/configure.in +++ b/configure.in @@ -1171,201 +1171,6 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then fi -dnl ---------------------------------------------------------------------- -dnl Is SSL library present? It is needed by GLOBUS-GASS and Grid Storage -dnl driver. SSL must be tested before them. -dnl -AC_SUBST([SSL]) SSL=yes -AC_ARG_WITH([ssl], - [AC_HELP_STRING([--with-ssl=LIB], - [Use the SSL library [default=no]])],, - withval=no) - -case "$withval" in - yes) - AC_CHECK_LIB([crypto], [main],, [unset SSL]) - AC_CHECK_LIB([ssl], [SSL_get_version],, [unset SSL]) - ;; - no) - AC_MSG_CHECKING([for SSL]) - AC_MSG_RESULT([suppressed]) - unset SSL - ;; - *) - saved_LDFLAGS="$LDFLAGS" - if test "X$with_ssl" != "X/usr/lib"; then - LDFLAGS="$LDFLAGS -L$with_ssl" - fi - AC_CHECK_LIB([crypto], [main],, [LDFLAGS="$saved_LDFLAGS"; unset SSL]) - AC_CHECK_LIB([ssl], [SSL_get_version],, [LDFLAGS="$saved_LDFLAGS"; unset SSL]) - ;; -esac - -dnl ---------------------------------------------------------------------- -dnl Is GLOBUS-GASS(1.1.0 or 1.1.1) Library present? It is also needed by -dnl the Grid Storage driver. -dnl -AC_SUBST([GASS]) GASS="yes" -AC_SUBST([TESTGASS]) TESTGASS='$(srcdir)/testgass' -AC_ARG_WITH([gass], - [AC_HELP_STRING([--with-gass=DIR], - [Use the GASS library [default=no]])],, - withval=no) - -case "$withval" in - yes) - AC_CHECK_HEADERS(globus_common.h,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) - ;; - no) - AC_MSG_CHECKING([for GASS]) - AC_MSG_RESULT([suppressed]) - unset GASS TESTGASS - ;; - *) - case "$withval" in - *,*) - gass_inc="`echo $withval | cut -f1 -d,`" - gass_lib="`echo $withval | cut -f2 -d, -s`" - ;; - *) - if test -n "$withval"; then - gass_inc="$withval/include" - gass_lib="$withval/lib" - fi - ;; - esac - - dnl Trying to include -I/usr/include and -L/usr/lib is redundant and - dnl can mess some compilers up. - if test "X$gass_inc" = "X/usr/include"; then - gass_inc="" - fi - if test "X$gass_lib" = "X/usr/lib"; then - gass_lib="" - fi - - if test -n "$gass_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gass_inc" - AC_CHECK_HEADERS([globus_common.h],, - CPPFLAGS="$saved_CPPFLAGS" - unset GASS TESTGASS) - else - AC_CHECK_HEADERS([globus_common.h]) - fi - - if test -n "$gass_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gass_lib" - AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) - else - AC_CHECK_LIB(globus_common,globus_module_activate,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_cache,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gaa,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gss_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_io,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer_assist,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_transfer,main,,unset GASS TESTGASS) - AC_CHECK_LIB(globus_gass_file,globus_gass_open,,unset GASS TESTGASS) - fi - ;; -esac - -if test -n "$GASS"; then - AC_DEFINE([HAVE_GASS], [1], [Define if the Globus GASS is defined]) -fi - -dnl ---------------------------------------------------------------------- -dnl Are SRB Client and other system libraries(socket, elf) present? -dnl -AC_SUBST([SRB]) SRB="yes" -AC_SUBST([TESTSRB]) TESTSRB='$(srcdir)/testsrb' -AC_ARG_WITH([srb], - [AC_HELP_STRING([--with-srb=DIR], - [Use the SRB library [default=no]])],, - withval=no) - -case "$withval" in - yes) - AC_CHECK_HEADERS([srbClient.h],, [unset SRB TESTSRB]) - AC_CHECK_LIB([elf], [main],, [unset SRB TESTSRB]) - AC_CHECK_LIB([socket], [main],, [unset SRB TESTSRB]) - AC_CHECK_LIB([SrbClient], [clConnect],, [unset SRB TESTSRB]) - ;; - no) - AC_MSG_CHECKING([for SRB]) - AC_MSG_RESULT([suppressed]) - unset SRB TESTSRB - ;; - *) - case "$withval" in - *,*) - srb_inc="`echo $withval | cut -f1 -d,`" - srb_lib="`echo $withval | cut -f2 -d, -s`" - ;; - *) - if test -n "$withval"; then - srb_inc="$withval/include" - srb_lib="$withval/lib" - fi - ;; - esac - - dnl Trying to include -I/usr/include and -L/usr/lib is redundant and - dnl can mess some compilers up. - if test "X$srb_inc" = "X/usr/include"; then - srb_inc="" - fi - if test "X$srb_lib" = "X/usr/lib"; then - srb_lib="" - fi - - if test -n "$srb_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$srb_inc" - AC_CHECK_HEADERS(srbClient.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset SRB TESTSRB) - else - AC_CHECK_HEADERS(srbClient.h) - fi - - if test -n "$srb_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$srb_lib" - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - else - AC_CHECK_LIB(elf,main,,unset SRB TESTSRB) - AC_CHECK_LIB(socket,main,,unset SRB TESTSRB) - AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB) - fi - ;; -esac - -if test -n "$SRB"; then - AC_DEFINE([HAVE_SRB], [1], [Define if the SRB is defined]) -fi - dnl Checkpoint the cache AC_CACHE_SAVE @@ -2694,9 +2499,6 @@ IF_YES_NO "$HAVE_DMALLOC" PRINT_N " Function Stack Tracing" IF_ENABLED_DISABLED "$FUNCSTACK" -PRINT_N " GASS" -IF_YES_NO "$GASS" - PRINT_N " GPFS" IF_YES_NO "$GPFS" @@ -2726,9 +2528,6 @@ else PRINT "No" fi -PRINT_N " SRB" -IF_YES_NO "$SRB" - PRINT_N " Threadsafety" IF_ENABLED_DISABLED "$THREADSAFE" diff --git a/fortran/configure b/fortran/configure index 2be07e8..9694881 100755 --- a/fortran/configure +++ b/fortran/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From fortran/configure.in Id: configure.in 15620 2008-09-14 19:55:08Z hdftest . +# From fortran/configure.in Id: configure.in 15670 2008-09-21 22:12:24Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 Fortran 1.6.7-snap20. # diff --git a/fortran/src/Dependencies b/fortran/src/Dependencies index 3c3125e..97e8e2b 100644 --- a/fortran/src/Dependencies +++ b/fortran/src/Dependencies @@ -41,14 +41,12 @@ H5f90kit.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -81,14 +79,12 @@ H5_f.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -121,14 +117,12 @@ H5Rf.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -161,14 +155,12 @@ H5Ff.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -203,14 +195,12 @@ H5Sf.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -243,14 +233,12 @@ H5Df.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -283,14 +271,12 @@ H5Gf.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -323,14 +309,12 @@ H5Af.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -365,14 +349,12 @@ H5Tf.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -405,14 +387,12 @@ H5Pf.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -445,14 +425,12 @@ H5If.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -487,14 +465,12 @@ H5Ef.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -527,14 +503,12 @@ H5Zf.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ @@ -567,14 +541,12 @@ H5FDmpiof.lo: \ $(top_srcdir)/fortran/../src/H5Tpublic.h \ $(top_srcdir)/fortran/../src/H5FDcore.h \ $(top_srcdir)/fortran/../src/H5FDfamily.h \ - $(top_srcdir)/fortran/../src/H5FDgass.h \ $(top_srcdir)/fortran/../src/H5FDlog.h \ $(top_srcdir)/fortran/../src/H5FDmpi.h \ $(top_srcdir)/fortran/../src/H5FDmpio.h \ $(top_srcdir)/fortran/../src/H5FDmpiposix.h \ $(top_srcdir)/fortran/../src/H5FDmulti.h \ $(top_srcdir)/fortran/../src/H5FDsec2.h \ - $(top_srcdir)/fortran/../src/H5FDsrb.h \ $(top_srcdir)/fortran/../src/H5FDstdio.h \ $(srcdir)/H5f90i.h \ $(top_srcdir)/fortran/../src/H5private.h \ diff --git a/hl/src/Dependencies b/hl/src/Dependencies index 34100c7..823f5e7 100644 --- a/hl/src/Dependencies +++ b/hl/src/Dependencies @@ -42,14 +42,12 @@ H5LT.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h H5TA.lo: \ $(srcdir)/H5TA.c \ @@ -79,14 +77,12 @@ H5TA.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h H5IM.lo: \ $(srcdir)/H5IM.c \ @@ -116,12 +112,10 @@ H5IM.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h diff --git a/hl/test/Dependencies b/hl/test/Dependencies index 2674a58..c03fb17 100644 --- a/hl/test/Dependencies +++ b/hl/test/Dependencies @@ -42,14 +42,12 @@ test_lite.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h test_image.lo: \ $(srcdir)/test_image.c \ @@ -79,14 +77,12 @@ test_image.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h test_table.lo: \ $(srcdir)/test_table.c \ @@ -116,12 +112,10 @@ test_table.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h diff --git a/hl/tools/gif2h5/Dependencies b/hl/tools/gif2h5/Dependencies index ffd5954..86b9f7a 100644 --- a/hl/tools/gif2h5/Dependencies +++ b/hl/tools/gif2h5/Dependencies @@ -42,14 +42,12 @@ decompress.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h gif2hdf.lo: \ $(srcdir)/gif2hdf.c \ @@ -78,15 +76,15 @@ gif2hdf.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h + $(top_srcdir)/src/H5FDstdio.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h \ + $(top_srcdir)/src/hdf5.h gif2mem.lo: \ $(srcdir)/gif2mem.c \ $(srcdir)/gif.h \ @@ -114,14 +112,12 @@ gif2mem.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h gifread.lo: \ $(srcdir)/gifread.c \ @@ -150,14 +146,12 @@ gifread.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h hdf2gif.lo: \ $(srcdir)/hdf2gif.c \ @@ -186,18 +180,17 @@ hdf2gif.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/hl/src/H5IM.h \ $(top_srcdir)/hl/src/H5LT.h \ - $(top_srcdir)/src/hdf5.h + $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h hdfgifwr.lo: \ $(srcdir)/hdfgifwr.c \ $(srcdir)/gif.h \ @@ -225,14 +218,12 @@ hdfgifwr.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h writehdf.lo: \ $(srcdir)/writehdf.c \ @@ -261,14 +252,12 @@ writehdf.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/hl/src/H5IM.h \ $(top_srcdir)/hl/src/H5LT.h \ diff --git a/perform/Dependencies b/perform/Dependencies index 9300811..8866d8f 100644 --- a/perform/Dependencies +++ b/perform/Dependencies @@ -41,14 +41,12 @@ iopipe.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -78,14 +76,12 @@ chunk.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h overhead.lo: \ $(srcdir)/overhead.c \ @@ -113,14 +109,12 @@ overhead.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -150,14 +144,12 @@ zip_perf.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -190,14 +182,12 @@ perf_meta.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -227,24 +217,22 @@ pio_perf.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/tools/lib/h5tools_utils.h \ - $(top_srcdir)/src/hdf5.h \ $(srcdir)/pio_perf.h \ $(srcdir)/pio_timer.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ $(top_srcdir)/test/h5test.h \ $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5private.h + $(top_srcdir)/src/H5private.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h \ + $(top_srcdir)/src/hdf5.h pio_engine.lo: \ $(srcdir)/pio_engine.c \ $(top_srcdir)/src/hdf5.h \ @@ -271,14 +259,12 @@ pio_engine.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/pio_perf.h \ $(srcdir)/pio_timer.h \ @@ -286,7 +272,9 @@ pio_engine.lo: \ $(top_srcdir)/src/H5MPprivate.h \ $(top_srcdir)/test/h5test.h \ $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5private.h + $(top_srcdir)/src/H5private.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h \ + $(top_srcdir)/src/hdf5.h pio_timer.lo: \ $(srcdir)/pio_timer.c \ $(srcdir)/pio_timer.h \ @@ -314,18 +302,18 @@ pio_timer.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/pio_perf.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ $(top_srcdir)/test/h5test.h \ $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5private.h + $(top_srcdir)/src/H5private.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h \ + $(top_srcdir)/src/hdf5.h diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 82d60a2..cfbb453 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -116,7 +116,8 @@ Bug Fixes since HDF5-1.6.7 Release Configuration ------------- - None + - The GASS and SRB virtual file drivers have been retired and removed + from the HDF5 library. AKC - 2008/9/26 Performance diff --git a/src/Dependencies b/src/Dependencies index 65bdde1..6402fa3 100644 --- a/src/Dependencies +++ b/src/Dependencies @@ -759,11 +759,9 @@ H5F.lo: \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5FDcore.h \ $(srcdir)/H5FDfamily.h \ - $(srcdir)/H5FDgass.h \ $(srcdir)/H5FDlog.h \ $(srcdir)/H5FDmulti.h \ $(srcdir)/H5FDsec2.h \ - $(srcdir)/H5FDsrb.h \ $(srcdir)/H5FDstdio.h H5Fdbg.lo: \ $(srcdir)/H5Fdbg.c \ @@ -973,11 +971,9 @@ H5FD.lo: \ $(srcdir)/H5SLprivate.h \ $(srcdir)/H5FDcore.h \ $(srcdir)/H5FDfamily.h \ - $(srcdir)/H5FDgass.h \ $(srcdir)/H5FDlog.h \ $(srcdir)/H5FDmulti.h \ $(srcdir)/H5FDsec2.h \ - $(srcdir)/H5FDsrb.h \ $(srcdir)/H5FDstdio.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MMprivate.h @@ -1069,50 +1065,6 @@ H5FDfamily.lo: \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ $(srcdir)/H5Zprivate.h -H5FDgass.lo: \ - $(srcdir)/H5FDgass.c \ - $(srcdir)/H5private.h \ - $(srcdir)/H5public.h \ - ./H5pubconf.h \ - $(srcdir)/H5api_adpt.h \ - $(srcdir)/H5MPprivate.h \ - $(srcdir)/H5Eprivate.h \ - $(srcdir)/H5Epublic.h \ - $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5Fprivate.h \ - $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5FDprivate.h \ - $(srcdir)/H5FDmpi.h \ - $(srcdir)/H5FDmpio.h \ - $(srcdir)/H5FDmpiposix.h \ - $(srcdir)/H5FDgass.h \ - $(srcdir)/H5Iprivate.h \ - $(srcdir)/H5MMprivate.h \ - $(srcdir)/H5MMpublic.h \ - $(srcdir)/H5Pprivate.h \ - $(srcdir)/H5Ppublic.h \ - $(srcdir)/H5Dpublic.h \ - $(srcdir)/H5Zpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ - $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Tprivate.h \ - $(srcdir)/H5Tpublic.h \ - $(srcdir)/H5Gprivate.h \ - $(srcdir)/H5Gpublic.h \ - $(srcdir)/H5Bprivate.h \ - $(srcdir)/H5Bpublic.h \ - $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Cprivate.h \ - $(srcdir)/H5Cpublic.h \ - $(srcdir)/H5FLprivate.h \ - $(srcdir)/H5RCprivate.h \ - $(srcdir)/H5RSprivate.h \ - $(srcdir)/H5Rprivate.h \ - $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Zprivate.h H5FDlog.lo: \ $(srcdir)/H5FDlog.c \ $(srcdir)/H5private.h \ @@ -1312,14 +1264,12 @@ H5FDmulti.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5FDcore.h \ $(srcdir)/H5FDfamily.h \ - $(srcdir)/H5FDgass.h \ $(srcdir)/H5FDlog.h \ $(srcdir)/H5FDmpi.h \ $(srcdir)/H5FDmpio.h \ $(srcdir)/H5FDmpiposix.h \ $(srcdir)/H5FDmulti.h \ $(srcdir)/H5FDsec2.h \ - $(srcdir)/H5FDsrb.h \ $(srcdir)/H5FDstdio.h H5FDsec2.lo: \ $(srcdir)/H5FDsec2.c \ @@ -1365,50 +1315,6 @@ H5FDsec2.lo: \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ $(srcdir)/H5Zprivate.h -H5FDsrb.lo: \ - $(srcdir)/H5FDsrb.c \ - $(srcdir)/H5private.h \ - $(srcdir)/H5public.h \ - ./H5pubconf.h \ - $(srcdir)/H5api_adpt.h \ - $(srcdir)/H5MPprivate.h \ - $(srcdir)/H5Eprivate.h \ - $(srcdir)/H5Epublic.h \ - $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5Fprivate.h \ - $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5FDprivate.h \ - $(srcdir)/H5FDmpi.h \ - $(srcdir)/H5FDmpio.h \ - $(srcdir)/H5FDmpiposix.h \ - $(srcdir)/H5FDsrb.h \ - $(srcdir)/H5Iprivate.h \ - $(srcdir)/H5MMprivate.h \ - $(srcdir)/H5MMpublic.h \ - $(srcdir)/H5Pprivate.h \ - $(srcdir)/H5Ppublic.h \ - $(srcdir)/H5Dpublic.h \ - $(srcdir)/H5Zpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ - $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Tprivate.h \ - $(srcdir)/H5Tpublic.h \ - $(srcdir)/H5Gprivate.h \ - $(srcdir)/H5Gpublic.h \ - $(srcdir)/H5Bprivate.h \ - $(srcdir)/H5Bpublic.h \ - $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Cprivate.h \ - $(srcdir)/H5Cpublic.h \ - $(srcdir)/H5FLprivate.h \ - $(srcdir)/H5RCprivate.h \ - $(srcdir)/H5RSprivate.h \ - $(srcdir)/H5Rprivate.h \ - $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Zprivate.h H5FDstdio.lo: \ $(srcdir)/H5FDstdio.c \ $(srcdir)/hdf5.h \ @@ -1435,14 +1341,12 @@ H5FDstdio.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5FDcore.h \ $(srcdir)/H5FDfamily.h \ - $(srcdir)/H5FDgass.h \ $(srcdir)/H5FDlog.h \ $(srcdir)/H5FDmpi.h \ $(srcdir)/H5FDmpio.h \ $(srcdir)/H5FDmpiposix.h \ $(srcdir)/H5FDmulti.h \ $(srcdir)/H5FDsec2.h \ - $(srcdir)/H5FDsrb.h \ $(srcdir)/H5FDstdio.h H5FL.lo: \ $(srcdir)/H5FL.c \ @@ -1644,7 +1548,8 @@ H5Gname.lo: \ $(srcdir)/H5FOprivate.h \ $(srcdir)/H5SLprivate.h \ $(srcdir)/H5Gpkg.h \ - $(srcdir)/H5Iprivate.h + $(srcdir)/H5Iprivate.h \ + $(srcdir)/H5MMprivate.h H5Gnode.lo: \ $(srcdir)/H5Gnode.c \ $(srcdir)/H5private.h \ @@ -37,12 +37,10 @@ /* Predefined file drivers */ #include "H5FDcore.h" /*temporary in-memory files */ #include "H5FDfamily.h" /*family of files */ -#include "H5FDgass.h" /*GASS I/O */ #include "H5FDlog.h" /* sec2 driver with logging, for debugging */ #include "H5FDmpi.h" /* MPI-based file drivers */ #include "H5FDmulti.h" /*multiple files partitioned by mem usage */ #include "H5FDsec2.h" /*Posix unbuffered I/O */ -#include "H5FDsrb.h" /*SRB I/O */ #include "H5FDstdio.h" /* Standard C buffered I/O */ /* Struct only used by functions H5F_get_objects and H5F_get_objects_cb */ @@ -38,12 +38,10 @@ #include "H5FDprivate.h" /* File drivers */ #include "H5FDcore.h" /* Files stored entirely in memory */ #include "H5FDfamily.h" /* File families */ -#include "H5FDgass.h" /* Remote files using GASS I/O */ #include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ #include "H5FDmpi.h" /* MPI-based file drivers */ #include "H5FDmulti.h" /* Usage-partitioned file family */ #include "H5FDsec2.h" /* POSIX unbuffered file I/O */ -#include "H5FDsrb.h" /* Remote access using SRB */ #include "H5FDstdio.h" /* Standard C buffered I/O */ #include "H5FLprivate.h" /* Free lists */ #include "H5Iprivate.h" /* IDs */ @@ -163,12 +161,6 @@ H5FD_term_interface(void) H5FD_log_term(); H5FD_stdio_term(); H5FD_family_term(); -#ifdef H5_HAVE_GASS - H5FD_gass_term(); -#endif -#ifdef H5_HAVE_SRB - H5FD_srb_term(); -#endif H5FD_core_term(); H5FD_multi_term(); #ifdef H5_HAVE_PARALLEL diff --git a/src/H5FDgass.c b/src/H5FDgass.c deleted file mode 100644 index dbbc6bb..0000000 --- a/src/H5FDgass.c +++ /dev/null @@ -1,868 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Saurabh Bagchi (bagchi@uiuc.edu) - * Thursday, August 12 -Tuesday, August 17, 1999 - * - * Purpose: This is the GASS I/O driver. - * - */ - -/* Interface initialization */ -#define H5_INTERFACE_INIT_FUNC H5FD_gass_init_interface - - -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5Fprivate.h" /* Files access */ -#include "H5FDprivate.h" /* File drivers */ -#include "H5FDgass.h" /* GASS file driver */ -#include "H5Iprivate.h" /* IDs */ -#include "H5MMprivate.h" /* Memory management */ -#include "H5Pprivate.h" /* Property lists */ - -#ifdef H5_HAVE_GASS - -/* The driver identification number, initialized at runtime */ -static hid_t H5FD_GASS_g = 0; - -/* File operations */ -#define OP_UNKNOWN 0 -#define OP_READ 1 -#define OP_WRITE 2 - -/* - * The description of a file belonging to this driver. The `eoa' and `eof' - * determine the amount of hdf5 address space in use and the high-water mark - * of the file (the current size of the underlying Unix file). The `pos' - * value is used to eliminate file position updates when they would be a - * no-op. Unfortunately we've found systems that use separate file position - * indicators for reading and writing so the lseek can only be eliminated if - * the current operation is the same as the previous operation. When opening - * a file the `eof' will be set to the current file size, `eoa' will be set - * to zero, `pos' will be set to H5F_ADDR_UNDEF (as it is when an error - * occurs), and `op' will be set to H5F_OP_UNKNOWN. - */ -typedef struct H5FD_gass_t { - H5FD_t pub; /*public stuff, must be first */ - int fd; /*the unix file */ - GASS_Info info; /*file information */ - haddr_t eoa; /*end of allocated region */ - haddr_t eof; /*end of file; current file size*/ - haddr_t pos; /*current file I/O position */ - int op; /*last operation */ - - -} H5FD_gass_t; - -/* - * This driver supports systems that have the lseek64() function by defining - * some macros here so we don't have to have conditional compilations later - * throughout the code. - * - * file_offset_t: The datatype for file offsets, the second argument of - * the lseek() or lseek64() call. - * - * file_seek: The function which adjusts the current file position, - * either lseek() or lseek64(). - */ -/* adding for windows NT file system support. */ - -#ifdef H5_HAVE_LSEEK64 -# define file_offset_t off64_t -# define file_seek lseek64 -#elif defined (WIN32) -# ifdef __MWERKS__ -# define file_offset_t off_t -# define file_seek lseek -# else /*MSVC*/ -# define file_offset_t __int64 -# define file_seek _lseeki64 -# endif -#else -# define file_offset_t off_t -# define file_seek lseek -#endif - - - -/* - * These macros check for overflow of various quantities. These macros - * assume that file_offset_t is signed and haddr_t and size_t are unsigned. - * - * ADDR_OVERFLOW: Checks whether a file address of type `haddr_t' - * is too large to be represented by the second argument - * of the file seek function. - * - * SIZE_OVERFLOW: Checks whether a buffer size of type `hsize_t' is too - * large to be represented by the `size_t' type. - * - * REGION_OVERFLOW: Checks whether an address and size pair describe data - * which can be addressed entirely by the second - * argument of the file seek function. - */ -#define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1) -#define ADDR_OVERFLOW(A) (HADDR_UNDEF==(A) || \ - ((A) & ~(haddr_t)MAXADDR)) -#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR) -#define REGION_OVERFLOW(A,Z) (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || \ - sizeof(file_offset_t)<sizeof(size_t) || \ - HADDR_UNDEF==(A)+(Z) || \ - (file_offset_t)((A)+(Z))<(file_offset_t)(A)) - -/* Prototypes */ -static H5FD_t *H5FD_gass_open(const char *name, unsigned flags, hid_t fapl_id, - haddr_t maxaddr); -static herr_t H5FD_gass_close(H5FD_t *_file); -static herr_t H5FD_gass_query(const H5FD_t *_f1, unsigned long *flags); -static haddr_t H5FD_gass_get_eoa(H5FD_t *_file); -static herr_t H5FD_gass_set_eoa(H5FD_t *_file, haddr_t addr); -static haddr_t H5FD_gass_get_eof(H5FD_t *_file); -static herr_t H5FD_gass_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle); -static herr_t H5FD_gass_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, - size_t size, void *buf); -static herr_t H5FD_gass_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, - size_t size, const void *buf); - -/* GASS I/O-specific file access properties */ -typedef struct H5FD_gass_fapl_t { - GASS_Info info; /* access property parameters */ -} H5FD_gass_fapl_t; - -/* The GASS IO driver information */ -static const H5FD_class_t H5FD_gass_g = { - "gass", /*name */ - MAXADDR, /*maxaddr */ - H5F_CLOSE_WEAK, /* fc_degree */ - NULL, /*sb_size */ - NULL, /*sb_encode */ - NULL, /*sb_decode */ - sizeof(H5FD_gass_fapl_t), /*fapl_size */ - NULL, /*fapl_get */ - NULL, /*fapl_copy */ - NULL, /*fapl_free */ - 0, /*dxpl_size */ - NULL, /*dxpl_copy */ - NULL, /*dxpl_free */ - H5FD_gass_open, /*open */ - H5FD_gass_close, /*close */ - NULL, /*cmp */ - H5FD_gass_query, /*query */ - NULL, /*alloc */ - NULL, /*free */ - H5FD_gass_get_eoa, /*get_eoa */ - H5FD_gass_set_eoa, /*set_eoa */ - H5FD_gass_get_eof, /*get_eof */ - H5FD_gass_get_handle, /*get_handle */ - H5FD_gass_read, /*read */ - H5FD_gass_write, /*write */ - NULL, /*flush */ - NULL, /*lock */ - NULL, /*unlock */ - H5FD_FLMAP_SINGLE /*fl_map */ -}; - - -/*-------------------------------------------------------------------------- -NAME - H5FD_gass_init_interface -- Initialize interface-specific information -USAGE - herr_t H5FD_gass_init_interface() - -RETURNS - Non-negative on success/Negative on failure -DESCRIPTION - Initializes any interface-specific data or routines. (Just calls - H5FD_gass_init currently). - ---------------------------------------------------------------------------*/ -static herr_t -H5FD_gass_init_interface(void) -{ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_gass_init_interface) - - FUNC_LEAVE_NOAPI(H5FD_gass_init()) -} /* H5FD_gass_init_interface() */ - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_init - * - * Purpose: Initialize this driver by registering the driver with the - * library. - * - * Return: Success: The driver ID for the gass driver. - * - * Failure: Negative. - * - * Programmer: Saurabh Bagchi - * Friday, August 13, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -hid_t -H5FD_gass_init(void) -{ - hid_t ret_value=H5FD_GASS_g; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_gass_init, FAIL) - - if (!H5FD_GASS_g) - H5FD_GASS_g = H5FD_register(&H5FD_gass_g,sizeof(H5FD_class_t)); - - globus_module_activate (GLOBUS_COMMON_MODULE); - globus_module_activate (GLOBUS_GASS_FILE_MODULE); - - /* Set return value */ - ret_value=H5FD_GASS_g; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*--------------------------------------------------------------------------- - * Function: H5FD_gass_term - * - * Purpose: Shut down the VFD - * - * Return: <none> - * - * Programmer: Quincey Koziol - * Friday, Jan 30, 2004 - * - * Modification: - * - *--------------------------------------------------------------------------- - */ -void -H5FD_gass_term(void) -{ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_gass_term) - - /* Reset VFL ID */ - H5FD_GASS_g=0; - - FUNC_LEAVE_NOAPI_VOID -} /* end H5FD_gass_term() */ - - -/*------------------------------------------------------------------------- - * Function: H5Pset_fapl_gass - * - * Purpose: Store the user supplied GASS INFO in - * the file access property list FAPL_ID which can then be used - * to create and/or open the file. - * - * GASS info object to be used for file open using GASS. - * Any modification to info after - * this function call returns may have undetermined effect - * to the access property list. Users should call this - * function again to setup the property list. - * - * - * Return: Success: Non-negative - * - * Failure: Negative - * - * Programmer: Saurabh Bagchi - * Friday, August 13, 1999 - * - * Modifications: - * - * Raymond Lu, 2001-10-25 - * Changed the file access list to the new generic property list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_fapl_gass(hid_t fapl_id, GASS_Info info) -{ - H5FD_gass_fapl_t fa; - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value; - - FUNC_ENTER_API(H5Pset_fapl_gass, FAIL) - /*NO TRACE*/ - - /* Check arguments */ - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list") - -#ifdef LATER -#warning "We need to verify that INFO contain sensible information." -#endif - - /* Initialize driver specific properties */ - fa.info = info; - - ret_value= H5P_set_driver(plist, H5FD_GASS, &fa); - -done: - FUNC_LEAVE_API(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5Pget_fapl_gass - * - * Purpose: If the file access property list is set to the H5FD_GASS - * driver then this function returns the GASS info object - * through the INFO pointer. - * - * Return: Success: Non-negative with the info object returned - * through the INFO arguments if non-null. - * The information is copied and it is therefore - * valid only until the file access property - * list is modified or closed. - * - * Failure: Negative - * - * Programmer: Saurabh Bagchi - * Friday, August 13, 1999 - * - * Modifications: - * - * Raymond Lu, 2001-10-25 - * Changed the file access list to the new generic property list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pget_fapl_gass(hid_t fapl_id, GASS_Info *info/*out*/) -{ - H5FD_gass_fapl_t *fa; - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_API(H5Pget_fapl_gass, FAIL) - H5TRACE2("e","ix",fapl_id,info); - - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") - if (H5FD_GASS!=H5P_get_driver(plist)) - HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver") - if (NULL==(fa=H5P_get_driver_info(plist))) - HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info") - - if (info) - *info = fa->info; - -done: - FUNC_LEAVE_API(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_open - * - * Purpose: Opens a file with name NAME. The FLAGS are a bit field with - * purpose similar to the second argument of open(2) and which - * are defined in H5Fpublic.h. The file access property list - * FAPL_ID contains the driver properties and MAXADDR - * is the largest address which this file will be expected to - * access. - * - * Return: Success: A pointer to a new file data structure. The - * public fields will be initialized by the - * caller, which is always H5FD_open(). - * - * Failure: NULL - * - * Programmer: Saurabh Bagchi - * Friday, August 13, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static H5FD_t * -H5FD_gass_open(const char *name, unsigned flags, hid_t fapl_id, - haddr_t maxaddr) -{ - int fd; - H5FD_gass_t *file=NULL; - const H5FD_gass_fapl_t *fa=NULL; - H5FD_gass_fapl_t _fa; - char *filename = (char *) H5MM_malloc(80 * sizeof(char)); - H5P_genplist_t *plist; /* Property list pointer */ - h5_stat_t sb; - H5FD_t *ret_value; - - FUNC_ENTER_NOAPI(H5FD_gass_open, NULL) - - /* fprintf(stdout, "Entering H5FD_gass_open name=%s flags=0x%x\n", name, flags); */ - - /* Check arguments */ - if (!name || !*name) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name") - if (0==maxaddr || HADDR_UNDEF==maxaddr) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr") - if (ADDR_OVERFLOW(maxaddr)) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr") - - strcpy (filename, name); - - /* Obtain a pointer to gass-specific file access properties */ - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list") - if (H5P_FILE_ACCESS_DEFAULT==fapl_id || H5FD_GASS!=H5P_get_driver(plist)) { - GASS_INFO_NULL (_fa.info); - /* _fa.info = GASS_INFO_NULL; */ - /* _fa.info = {0,0}; */ /*default*/ - fa = &_fa; - } else { - fa = H5P_get_driver_info(plist); - assert(fa); - } - - /* When I come down here, the possible flag values and the correct - responses are given here :- - - 1. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_EXCL : The file is - a new one. Go ahead and open it in O_RDWR. - - 2. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_TRUNC : Use - O_RDWR | O_TRUNC with gass_open. - - 3. H5F_ACC_RDWR | H5F_ACC_TRUNC : File already exists. Truncate it. - - 4. H5F_ACC_RDWR : Use O_RDWR with gass_open - - 5. H5F_ACC_RDWR is not set : Use O_RDONLY with gass_open - - One reason why we cannot simply pass on the flags to gass_open - is that gass_open does not support many of them (e.g., O_CREAT) - */ - - - if ((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) && (flags & H5F_ACC_EXCL)) { - if ((fd = globus_gass_open (filename, O_RDWR|O_TRUNC)) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "open failed") - } - else if ((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) && (flags & H5F_ACC_TRUNC)) { - if ((fd = globus_gass_open (filename, O_RDWR|O_TRUNC)) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "open failed") - - } - else if ((flags & H5F_ACC_RDWR) && (flags & H5F_ACC_TRUNC)) { - if ((fd = globus_gass_open (filename, O_RDWR|O_TRUNC)) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "open failed") - - } - else if (flags & H5F_ACC_RDWR) { - if ((fd = globus_gass_open (filename, O_RDWR)) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "open failed") - - } - else { /* This is case where H5F_ACC_RDWR is not set */ - if ((fd = globus_gass_open (filename, O_RDONLY)) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "open failed") - - } - - if (HDfstat(fd, &sb)<0) { - close(fd); - HGOTO_ERROR(H5E_IO, H5E_BADFILE, NULL, "fstat failed") - } - - /* Create the new file struct */ - if (NULL==(file=H5MM_calloc(sizeof(H5FD_gass_t)))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate file struct") - file->fd = fd; - file->eof = sb.st_size; - file->pos = HADDR_UNDEF; - file->op = OP_UNKNOWN; - file->info = fa->info; - - /* Set return value */ - ret_value=(H5FD_t*)file; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_close - * - * Purpose: Closes a GASS file. - * - * Return: Success: 0 - * - * Failure: -1, file not closed. - * - * Programmer: Saurabh Bagchi - * Monday, August 16, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_gass_close (H5FD_t *_file) -{ - H5FD_gass_t *file = (H5FD_gass_t *)_file; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_gass_close, FAIL) - - if (file == NULL) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle") - - if (globus_gass_close (file->fd) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "can't close GASS file") - - H5MM_xfree(file); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_query - * - * Purpose: Set the flags that this VFL driver is capable of supporting. - * (listed in H5FDpublic.h) - * - * Return: Success: non-negative - * - * Failure: negative - * - * Programmer: Quincey Koziol - * Tuesday, September 26, 2000 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_gass_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */) -{ - herr_t ret_value=SUCCEED; - - FUNC_ENTER_NOAPI(H5FD_gass_query, FAIL) - - /* Set the VFL feature flags that this driver supports */ - if(flags) { - *flags = 0; - *flags|=H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */ - *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */ - } - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_get_eoa - * - * Purpose: Gets the end-of-address marker for the file. The EOA marker - * is the first address past the last byte allocated in the - * format address space. - * - * Return: Success: The end-of-address marker. - * - * Failure: HADDR_UNDEF - * - * Programmer: Saurabh Bagchi - * Monday, August 16, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static haddr_t -H5FD_gass_get_eoa(H5FD_t *_file) -{ - H5FD_gass_t *file = (H5FD_gass_t *)_file; - haddr_t ret_value; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_gass_get_eoa, HADDR_UNDEF) - - /* Set return value */ - ret_value=file->eoa; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_set_eoa - * - * Purpose: Set the end-of-address marker for the file. This function is - * called shortly after an existing HDF5 file is opened in order - * to tell the driver where the end of the HDF5 data is located. - * - * Return: Success: 0 - * - * Programmer: Saurabh Bagchi - * Monday, August 16, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_gass_set_eoa(H5FD_t *_file, haddr_t addr) -{ - H5FD_gass_t *file = (H5FD_gass_t *)_file; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_gass_set_eoa, FAIL) - - file->eoa = addr; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_get_eof - * - * Purpose: Returns the end-of-file marker, which is the greater of - * either the Unix end-of-file or the HDF5 end-of-address - * markers. - * - * Return: Success: End of file address, the first address past - * the end of the "file", either the Unix file - * or the HDF5 file. - * - * Failure: HADDR_UNDEF - * - * Programmer: Saurabh Bagchi - * Monday, August 16, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static haddr_t -H5FD_gass_get_eof(H5FD_t *_file) -{ - H5FD_gass_t *file = (H5FD_gass_t*)_file; - haddr_t ret_value; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_gass_get_eof, HADDR_UNDEF) - - /* Set return value */ - ret_value=MAX(file->eof, file->eoa); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_get_handle - * - * Purpose: Returns the file handle of GASS file driver. - * - * Returns: Non-negative if succeed or negative if fails. - * - * Programmer: Raymond Lu - * Sept. 16, 2002 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_gass_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle) -{ - H5FD_gass_t *file = (H5FD_gass_t *)_file; - herr_t ret_value = SUCCEED; - - FUNC_ENTER_NOAPI(H5FD_gass_get_handle, FAIL) - - if(!file_handle) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid") - - *file_handle = &(file->fd); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_read - * - * Purpose: Reads SIZE bytes of data from FILE beginning at address ADDR - * into buffer BUF. - * - * Return: Success: Zero. Result is stored in caller-supplied - * buffer BUF. - * - * Failure: -1, Contents of buffer BUF are undefined. - * - * Programmer: Saurabh Bagchi - * Monday, August 16, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_gass_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id/*unused*/, haddr_t addr, - size_t size, void *buf/*out*/) -{ - H5FD_gass_t *file = (H5FD_gass_t*)_file; - ssize_t nbytes; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_gass_read, FAIL) - - assert(file && file->pub.cls); - assert(buf); - - /* Check for overflow conditions */ - if (HADDR_UNDEF==addr) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined") - if (REGION_OVERFLOW(addr, size)) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - if (addr+size>file->eoa) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - - /* Seek to the correct location */ - if ((addr!=file->pos || OP_READ!=file->op) && - file_seek(file->fd, (file_offset_t)addr, SEEK_SET)<0) { - file->pos = HADDR_UNDEF; - file->op = OP_UNKNOWN; - HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "gass file seek failed") - } - - /* - * Read data, being careful of interrupted system calls, partial results, - * and the end of the file. - */ - while (size>0) { - do - nbytes = read(file->fd, buf, size); - while (-1==nbytes && EINTR==errno); - - if (-1==nbytes) { - /* error */ - file->pos = HADDR_UNDEF; - file->op = OP_UNKNOWN; - HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "gass file read failed") - } - if (0==nbytes) { - /* end of file but not end of format address space */ - memset(buf, 0, size); - size = 0; - } - assert(nbytes>=0); - assert(nbytes<=size); - size -= (hsize_t)nbytes; - addr += (haddr_t)nbytes; - buf = (char*)buf + nbytes; - } - - /* Update current position */ - file->pos = addr; - file->op = OP_READ; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_gass_write - * - * Purpose: Writes SIZE bytes of data to FILE beginning at address ADDR - * from buffer BUF. - * - * Return: Success: Zero - * - * Failure: -1 - * - * Programmer: Saurabh Bagchi - * Tuesday, August 17, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_gass_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id/*unused*/, haddr_t addr, - size_t size, const void *buf) -{ - H5FD_gass_t *file = (H5FD_gass_t*)_file; - ssize_t nbytes; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_gass_write, FAIL) - - assert(file && file->pub.cls); - assert(buf); - - /* Check for overflow conditions */ - if (HADDR_UNDEF==addr) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined") - if (REGION_OVERFLOW(addr, size)) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - if (addr+size>file->eoa) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - - /* Seek to the correct location */ - if ((addr!=file->pos || OP_WRITE!=file->op) && - file_seek(file->fd, (file_offset_t)addr, SEEK_SET)<0) { - file->pos = HADDR_UNDEF; - file->op = OP_UNKNOWN; - HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "gass file seek failed") - } - - /* - * Write the data, being careful of interrupted system calls and partial - * results - */ - while (size>0) { - do - nbytes = write(file->fd, buf, size); - while (-1==nbytes && EINTR==errno); - - if (-1==nbytes) { - /* error */ - file->pos = HADDR_UNDEF; - file->op = OP_UNKNOWN; - HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "gass file write failed") - } - assert(nbytes>0); - assert(nbytes<=size); - size -= (hsize_t)nbytes; - addr += (haddr_t)nbytes; - buf = (const char*)buf + nbytes; - } - - /* Update current position and eof */ - file->pos = addr; - file->op = OP_WRITE; - if (file->pos>file->eof) - file->eof = file->pos; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - -#endif /* H5_HAVE_GASS */ diff --git a/src/H5FDgass.h b/src/H5FDgass.h deleted file mode 100644 index 52b6db2..0000000 --- a/src/H5FDgass.h +++ /dev/null @@ -1,70 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Saurabh Bagchi <bagchi@uiuc.edu> - * Tuesday, August 17, 1999 - * - * Purpose: The public header file for the gass driver. - */ -#ifndef H5FDgass_H -#define H5FDgass_H - -#include "H5FDpublic.h" -#include "H5Ipublic.h" - -#include <string.h> - -#ifdef H5_HAVE_GASS -#define H5FD_GASS (H5FD_gass_init()) -#else -#define H5FD_GASS (-1) -#endif - -#ifdef H5_HAVE_GASS -/* Define the GASS info object. (Will be added to later as more GASS - functionality is sought to be exposed. */ -typedef struct GASS_Info { - unsigned long block_size; - unsigned long max_length; -} GASS_Info; - -#define GASS_INFO_NULL(v) memset((void *)&v, 0, sizeof(GASS_Info)); -/* - GASS_Info zzGassInfo = {0L,0L}; - #define GASS_INFO_NULL zzGassInfo -*/ -#endif - -/* Function prototypes */ -#ifdef H5_HAVE_GASS - -#ifdef __cplusplus -extern "C" { -#endif - -hid_t H5FD_gass_init(void); -void H5FD_gass_term(void); -herr_t H5Pset_fapl_gass(hid_t fapl_id, GASS_Info info); -herr_t H5Pget_fapl_gass(hid_t fapl_id, GASS_Info *info/*out*/); - -#ifdef __cplusplus -} -#endif - -#endif - -#endif /* H5FDgass_H */ - diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c deleted file mode 100644 index 7564686..0000000 --- a/src/H5FDsrb.c +++ /dev/null @@ -1,844 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Raymond Lu <slu@ncsa.uiuc.edu> - * Wednesday, April 12, 2000 - * - * Purpose: SRB I/O driver. - */ - -/* Interface initialization */ -#define H5_INTERFACE_INIT_FUNC H5FD_srb_init_interface - - -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5Fprivate.h" /* File access */ -#include "H5FDprivate.h" /* File drivers */ -#include "H5FDsrb.h" /* SRB file driver */ -#include "H5Iprivate.h" /* IDs */ -#include "H5MMprivate.h" /* Memory management */ -#include "H5Pprivate.h" /* Property lists */ - - -#ifdef H5_HAVE_SRB - -/* The driver identification number, initialized at runtime */ -static hid_t H5FD_SRB_g = 0; - -/* - * This driver supports systems that have the lseek64() function by defining - * some macros here so we don't have to have conditional compilations later - * throughout the code. - * - * file_offset_t: The datatype for file offsets, the second argument of - * the lseek() or lseek64() call. - * - * file_seek: The function which adjusts the current file position, - * either lseek() or lseek64(). - */ -/* adding for windows NT file system support. */ - -#ifdef H5_HAVE_LSEEK64 -# define file_offset_t off64_t -# define file_seek lseek64 -#elif defined (WIN32) -# ifdef __MWERKS__ -# define file_offset_t off_t -# define file_seek lseek -# else /*MSVC*/ -# define file_offset_t __int64 -# define file_seek _lseeki64 -# endif -#else -# define file_offset_t off_t -# define file_seek lseek -#endif - - -/* - * These macros check for overflow of various quantities. These macros - * assume that file_offset_t is signed and haddr_t and size_t are unsigned. - * - * ADDR_OVERFLOW: Checks whether a file address of type `haddr_t' - * is too large to be represented by the second argument - * of the file seek function. - * - * SIZE_OVERFLOW: Checks whether a buffer size of type `hsize_t' is too - * large to be represented by the `size_t' type. - * - * REGION_OVERFLOW: Checks whether an address and size pair describe data - * which can be addressed entirely by the second - * argument of the file seek function. - */ -#define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1) -#define ADDR_OVERFLOW(A) (HADDR_UNDEF==(A) || \ - ((A) & ~(haddr_t)MAXADDR)) -#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR) -#define REGION_OVERFLOW(A,Z) (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || \ - sizeof(file_offset_t)<sizeof(size_t) || \ - HADDR_UNDEF==(A)+(Z) || \ - (file_offset_t)((A)+(Z))<(file_offset_t)(A)) - - -static H5FD_t *H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, - haddr_t maxaddr); -static herr_t H5FD_srb_close(H5FD_t *_file); -static herr_t H5FD_srb_query(const H5FD_t *_f1, unsigned long *flags); -static haddr_t H5FD_srb_get_eoa(H5FD_t *_file); -static herr_t H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr); -static haddr_t H5FD_srb_get_eof(H5FD_t *_file); -static herr_t H5FD_srb_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle); -static herr_t H5FD_srb_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, - size_t size, void *buf); -static herr_t H5FD_srb_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, - size_t size, const void *buf); -static herr_t H5FD_srb_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing); - -/* The description of a file belonging to this driver. */ -typedef struct H5FD_srb_t { - H5FD_t pub; /*public stuff, must be first */ - int fd; /*file descriptor */ - srbConn *srb_conn; /*SRB connection handler */ - SRB_Info info; /*file information */ - haddr_t eoa; /*end of allocated region */ - haddr_t eof; /*end of file; current file size*/ - haddr_t pos; /*current file I/O position */ -} H5FD_srb_t; - -/* SRB-specific file access properties */ -typedef struct H5FD_srb_fapl_t { - srbConn *srb_conn; /*SRB connection handler */ - SRB_Info info; /*file information */ -} H5FD_srb_fapl_t; - -/* SRB file driver information */ -static const H5FD_class_t H5FD_srb_g = { - "srb", /*name */ - MAXADDR, /*maxaddr */ - H5F_CLOSE_WEAK, /* fc_degree */ - NULL, /*sb_size */ - NULL, /*sb_encode */ - NULL, /*sb_decode */ - sizeof(H5FD_srb_fapl_t), /*fapl_size */ - NULL, /*fapl_get */ - NULL, /*fapl_copy */ - NULL, /*fapl_free */ - 0, /*dxpl_size */ - NULL, /*dxpl_copy */ - NULL, /*dxpl_free */ - H5FD_srb_open, /*open */ - H5FD_srb_close, /*close */ - NULL, /*cmp */ - H5FD_srb_query, /*query */ - NULL, /*alloc */ - NULL, /*free */ - H5FD_srb_get_eoa, /*get_eoa */ - H5FD_srb_set_eoa, /*set_eoa */ - H5FD_srb_get_eof, /*get_eof */ - H5FD_srb_get_handle, /*get_handle */ - H5FD_srb_read, /*read */ - H5FD_srb_write, /*write */ - H5FD_srb_flush, /*flush */ - NULL, /*lock */ - NULL, /*unlock */ - H5FD_FLMAP_SINGLE /*fl_map */ -}; - - -/*-------------------------------------------------------------------------- -NAME - H5FD_srb_init_interface -- Initialize interface-specific information -USAGE - herr_t H5FD_srb_init_interface() - -RETURNS - Non-negative on success/Negative on failure -DESCRIPTION - Initializes any interface-specific data or routines. (Just calls - H5FD_srb_init currently). - ---------------------------------------------------------------------------*/ -static herr_t -H5FD_srb_init_interface(void) -{ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_srb_init_interface) - - FUNC_LEAVE_NOAPI(H5FD_srb_init()) -} /* H5FD_srb_init_interface() */ - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_init - * - * Purpose: Initialize this driver by registering the driver with the - * library. - * - * Return: Success: The driver ID for the srb driver. - * - * Failure: Negative. - * - * Programmer: Raymond Lu - * Wednesday, April 12, 2000 - * Modifications: - * - *------------------------------------------------------------------------- - */ -hid_t -H5FD_srb_init(void) -{ - hid_t ret_value=H5FD_SRB_g; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_init, FAIL) - - if(H5I_VFL != H5Iget_type(H5FD_SRB_g)) - H5FD_SRB_g = H5FD_register(&H5FD_srb_g,sizeof(H5FD_class_t)); - - /* Set return value */ - ret_value=H5FD_SRB_g; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*--------------------------------------------------------------------------- - * Function: H5FD_srb_term - * - * Purpose: Shut down the VFD - * - * Return: <none> - * - * Programmer: Quincey Koziol - * Friday, Jan 30, 2004 - * - * Modification: - * - *--------------------------------------------------------------------------- - */ -void -H5FD_srb_term(void) -{ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_srb_term) - - /* Reset VFL ID */ - H5FD_SRB_g=0; - - FUNC_LEAVE_NOAPI_VOID -} /* end H5FD_srb_term() */ - - -/*------------------------------------------------------------------------- - * Function: H5Pset_fapl_srb - * - * Purpose: Store srb connection(client to server) handler SRB_CONN - * after connected and user supplied INFO in the file access - * property list FAPL_ID, which can be used to create or open - * file. - * - * Return: Success: Non-negative - * - * Failure: Negative - * - * Programmer: Raymond Lu - * April 12, 2000 - * - * Modifications: - * - * Raymond Lu, 2001-10-25 - * Use the new generic property list for argument checking. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info) -{ - H5FD_srb_fapl_t fa; - int srb_status; - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value; - - FUNC_ENTER_API(H5Pset_fapl_srb, FAIL) - /*NO TRACE*/ - - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") - - /*connect to SRB server */ - fa.srb_conn = clConnect(info.srbHost, info.srbPort, info.srbAuth); - if((srb_status = clStatus(fa.srb_conn)) != CLI_CONNECTION_OK) { - fprintf(stderr,"%s",clErrorMessage(fa.srb_conn)); - clFinish(fa.srb_conn); - - /*not sure about first 2 parameters. */ - HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "Connection to srbMaster failed.") - } - - fa.info = info; - ret_value = H5P_set_driver(plist, H5FD_SRB, &fa); - -done: - FUNC_LEAVE_API(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5Pget_fapl_srb - * - * Purpose: If the file access property list is set to the H5FD_SRB - * driver then this function returns the srb file INFO. - * - * Return: Success: File INFO is returned. - * Failure: Negative - * - * Programmer: Raymond Lu - * April 12, 2000 - * - * Modifications: - * - * Raymond Lu, 2001-10-25 - * Use the new generic property list for checking property list - * ID. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info/*out*/) -{ - H5P_genplist_t *plist; /* Property list pointer */ - H5FD_srb_fapl_t *fa; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_API(H5Pget_fapl_srb, FAIL) - H5TRACE2("e","ix",fapl_id,info); - - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") - if(H5FD_SRB != H5P_get_driver(plist)) - HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver") - if(NULL==(fa=H5P_get_driver_info(plist))) - HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info") - - if(info) - *info = fa->info; - -done: - FUNC_LEAVE_API(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_open - * - * Purpose: Opens a file with name NAME. The FLAGS are a bit field with - * purpose similar to the second argument of open(2) and which - * are defined in H5Fpublic.h. The file access property list - * FAPL_ID contains the properties driver properties and MAXADDR - * is the largest address which this file will be expected to - * access. - * - * Return: Success: A new file pointer. - * - * Failure: NULL - * - * Programmer: Raymond Lu - * April 12, 2000 - * Modifications: - *------------------------------------------------------------------------- - */ -static H5FD_t * -H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) -{ - struct srbStat srb_stat; - H5FD_srb_fapl_t *fa=NULL; - H5FD_srb_fapl_t _fa; - H5FD_srb_t *file; - int srb_fid; - H5P_genplist_t *plist; /* Property list pointer */ - H5FD_t *ret_value; - - FUNC_ENTER_NOAPI(H5FD_srb_open, FAIL) - - /* Check arguments */ - if (!name || !*name) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name") - if (0==maxaddr || HADDR_UNDEF==maxaddr) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr") - if (ADDR_OVERFLOW(maxaddr)) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr") - - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list") - if(H5P_FILE_ACCESS_DEFAULT==fapl_id || H5FD_SRB!=H5P_get_driver(plist)) { - HDmemset((void*)&_fa, 0, sizeof(H5FD_srb_fapl_t)); - fa = &_fa; - } - else { - fa = H5P_get_driver_info(plist); - assert(fa); - } - - /* When I come down here, the possible flag values and the correct - * responses are given here :- - * - * 1. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_EXCL : The file is - * a new one. Go ahead and open it with srbObjCreate. - * 2. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_TRUNC : how do I handle this? - * srbObjCreate doesn't support truncate while srbObjOpen doesn't - * support create. Try to call both srbFileCreate and srbFileOpen! - * 3. H5F_ACC_RDWR | H5F_ACC_TRUNC : Use O_RDWR | O_TRUNC with srbObjOpen. - * 4. H5F_ACC_RDWR : Use O_RDWR with srbObjOpen. - * 5. Flag is not set : Use O_RDONLY with srbObjOpen. - * - * (In srbObjOpen, O_CREATE is not supported. For file creation, use - * srbObjCreate.) - */ - - if((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) && - (flags & H5F_ACC_EXCL)) - srb_fid = srbFileCreate(fa->srb_conn, fa->info.storSysType, - fa->info.srbHost, name, fa->info.mode, fa->info.size); - else if((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) && - (flags & H5F_ACC_TRUNC)) { - if( (srb_fid = srbFileCreate(fa->srb_conn, fa->info.storSysType, - fa->info.srbHost, name, fa->info.mode, fa->info.size)) < 0 ) { - srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType, - fa->info.srbHost, name, O_RDWR|O_TRUNC, fa->info.mode); - } - } - else if((flags & H5F_ACC_RDWR) && (flags & H5F_ACC_TRUNC)) - srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType, - fa->info.srbHost, name, O_RDWR|O_TRUNC, fa->info.mode); - else if(flags & H5F_ACC_RDWR) - srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType, - fa->info.srbHost, name, O_RDWR, fa->info.mode); - else - srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType, - fa->info.srbHost, name, O_RDONLY, fa->info.mode); - - - if(srb_fid < 0) { -#ifdef OLD_WAY - fprintf(stderr, "cannot open file %s\n", name); - fprintf(stderr,"%s",clErrorMessage(fa->srb_conn)); - clFinish(fa->srb_conn); - HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "cannot open file") -#else /* OLD_WAY */ - HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, clErrorMessage(fa->srb_conn)) -#endif /* OLD_WAY */ - } - - if(srbFileStat(fa->srb_conn, fa->info.storSysType, fa->info.srbHost, name, - &srb_stat)!=0) { -#ifdef OLD_WAY - srbFileClose(fa->srb_conn, srb_fid); - clFinish(fa->srb_conn); - HGOTO_ERROR(H5E_IO, H5E_BADFILE, NULL, "SRB file stat failed") -#else /* OLD_WAY */ - HGOTO_ERROR(H5E_IO, H5E_BADFILE, NULL, "SRB file stat failed") -#endif /* OLD_WAY */ - } - - if (NULL==(file=H5MM_calloc(sizeof(H5FD_srb_t)))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate file struct") - - file->fd = srb_fid; - file->eof = srb_stat.st_size; - file->pos = HADDR_UNDEF; - file->srb_conn = fa->srb_conn; - file->info = fa->info; - - /* Set return value */ - ret_value=(H5FD_t*)file; - -done: - if(ret_value==NULL) { - if(fa!=NULL) - clFinish(fa->srb_conn); - if(srb_fid>=0) - srbFileClose(fa->srb_conn, srb_fid); - } /* end if */ - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_close - * - * Purpose: Closes a file and srb connection. - * - * Return: Success: Non-negative - * - * Failure: Negative - * - * Programmer: Raymond Lu - * Modification: - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_srb_close(H5FD_t *_file) -{ - H5FD_srb_t *file = (H5FD_srb_t *)_file; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_close, FAIL) - - srbFileClose(file->srb_conn, file->fd); - clFinish(file->srb_conn); - - H5MM_xfree(file); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_query - * - * Purpose: Set the flags that this VFL driver is capable of supporting. - * (listed in H5FDpublic.h) - * - * Return: Success: non-negative - * - * Failure: negative - * - * Programmer: Quincey Koziol - * Tuesday, September 26, 2000 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_srb_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */) -{ - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_query, FAIL) - - /* Set the VFL feature flags that this driver supports */ - if(flags) { - *flags = 0; - *flags|=H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */ - *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */ - } - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_get_eoa - * - * Purpose: Gets the end-of-address marker for the file. The EOA marker - * is the first address past the last byte allocated in the - * format address space. - * - * Return: Success: The end-of-address marker. - * - * Failure: HADDR_UNDEF - * - * Programmer: Raymond Lu - * April 12, 2000 - * - * Modifications: - *------------------------------------------------------------------------- - */ -static haddr_t -H5FD_srb_get_eoa(H5FD_t *_file) -{ - H5FD_srb_t *file = (H5FD_srb_t *)_file; - haddr_t ret_value; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_get_eoa, HADDR_UNDEF) - - /* Set return value */ - ret_value=file->eoa; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_set_eoa - * - * Purpose: Set the end-of-address marker for the file. This function is - * called shortly after an existing HDF5 file is opened in order - * to tell the driver where the end of the HDF5 data is located. - * - * Return: Success: 0 - * - * Failure: -1 - * - * Programmer: Robb Matzke - * Friday, August 6, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr) -{ - H5FD_srb_t *file = (H5FD_srb_t *)_file; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_set_eoa, FAIL) - - file->eoa = addr; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_get_eof - * - * Purpose: Gets the end-of-file marker for the file. The EOF marker - * is the real size of the file. - * - * Return: Success: The end-of-address marker. - * - * Failure: HADDR_UNDEF - * - * Programmer: Raymond Lu - * April 12, 2000 - * - * Modifications: - *------------------------------------------------------------------------- - */ -static haddr_t -H5FD_srb_get_eof(H5FD_t *_file) -{ - H5FD_srb_t *file = (H5FD_srb_t *)_file; - haddr_t ret_value; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_get_eof, HADDR_UNDEF) - - /* Set return value */ - ret_value=file->eof; - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_get_handle - * - * Purpose: Returns the file handle of SRB file driver. - * - * Returns: Non-negative if succeed or negative if fails. - * - * Programmer: Raymond Lu - * Sept. 16, 2002 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_srb_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle) -{ - H5FD_srb_t *file = (H5FD_srb_t *)_file; - herr_t ret_value = SUCCEED; - - FUNC_ENTER_NOAPI(H5FD_srb_get_eof, FAIL) - - if(!file_handle) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid") - - *file_handle = &(file->fd); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_read - * - * Purpose: Reads SIZE bytes of data from FILE beginning at address ADDR - * into buffer BUF. - * - * Return: Success: Zero. Result is stored in caller-supplied - * buffer BUF. - * - * Failure: -1, Contents of buffer BUF are undefined. - * - * Programmer: Raymond Lu - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_srb_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr, - size_t size, void *buf) -{ - H5FD_srb_t *file = (H5FD_srb_t*)_file; - ssize_t nbytes; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_read, FAIL) - - /* Check for overflow conditions */ - if (HADDR_UNDEF==addr) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined") - if (REGION_OVERFLOW(addr, size)) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - if (addr+size>file->eoa) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - - if( addr!=file->pos && - srbFileSeek(file->srb_conn, (int)file->fd, (int)addr, SEEK_SET)<0 ) - HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file seek failed") - - /* - * Read data, being careful of interrupted system calls, partial results, - * and the end of the file. - */ - while(size>0) { - if((nbytes=srbFileRead(file->srb_conn, (int)file->fd, (char*)buf, size))<0) - HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "srb file write failed") - - if (0==nbytes) { - /*end of file but not end of format address space*/ - HDmemset(buf, 0, size); - size = 0; - } - size -= nbytes; - addr += (haddr_t)nbytes; - buf = (char*)buf + nbytes; - } - - /* Update current position */ - file->pos = addr; - -done: - if(ret_value<0) { - /* Reset file position */ - file->pos = HADDR_UNDEF; - - /* Close connection, etc. */ - srbFileClose(file->srb_conn, file->fd); - clFinish(file->srb_conn); - } /* end if */ - - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_write - * - * Purpose: Writes SIZE bytes of data to FILE beginning at address ADDR - * from buffer BUF. - * - * Return: Success: Zero. - * - * Failure: -1 - * - * Programmer: Raymond Lu - * April 12, 2000 - * Modifications: - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_srb_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr, - size_t size, const void *buf) -{ - H5FD_srb_t *file = (H5FD_srb_t*)_file; - ssize_t nbytes; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_write, FAIL) - - /* Check for overflow conditions */ - if (HADDR_UNDEF==addr) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined") - if (REGION_OVERFLOW(addr, size)) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - if (addr+size>file->eoa) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large") - - if( addr!=file->pos && - srbFileSeek(file->srb_conn, (int)file->fd, (int)addr, SEEK_SET)<0 ) - HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file seek failed") - - while(size>0) { - if( (nbytes=srbFileWrite(file->srb_conn, (int)file->fd, (char*)buf, size)) < 0 ) - HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "srb file write failed") - - size -= nbytes; - addr += (haddr_t)nbytes; - buf = (const char*)buf + nbytes; - } - - /* Update current position and eof */ - file->pos = addr; - if(file->pos > file->eof) - file->eof = file->pos; - -done: - if(ret_value<0) { - /* Reset file position */ - file->pos = HADDR_UNDEF; - - /* Close connection, etc. */ - srbFileClose(file->srb_conn, file->fd); - clFinish(file->srb_conn); - } /* end if */ - - FUNC_LEAVE_NOAPI(ret_value) -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_srb_flush - * - * Purpose: Makes sure that all data is on disk. - * - * Return: Success: Non-negative - * - * Failure: Negative - * - * Programmer: Raymond Lu - * April 12, 2000 - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_srb_flush(H5FD_t *_file, hid_t dxpl_id, unsigned UNUSED closing) -{ - H5FD_srb_t *file = (H5FD_srb_t*)_file; - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_NOAPI(H5FD_srb_flush, FAIL) - - if(srbFileSync(file->srb_conn, file->fd) != 0) - HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file sync failed") - -done: - if(ret_value<0) { - srbFileClose(file->srb_conn, file->fd); - clFinish(file->srb_conn); - } /* end if */ - - FUNC_LEAVE_NOAPI(ret_value) -} - -#endif /* H5_HAVE_SRB */ diff --git a/src/H5FDsrb.h b/src/H5FDsrb.h deleted file mode 100644 index 94794e9..0000000 --- a/src/H5FDsrb.h +++ /dev/null @@ -1,58 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Raymond Lu <slu@ncsa.uiuc.edu> - * Wednesday, April 12, 2000 - * Purpose: The public header file for the SRB driver. - */ -#ifndef H5FDsrb_H -#define H5FDsrb_H - -#include "H5FDpublic.h" -#include "H5Ipublic.h" - -#ifdef H5_HAVE_SRB - -#define H5FD_SRB (H5FD_srb_init()) - -typedef struct SRB_Info { /* Define the SRB info object. */ - char *srbHost; /* SRB host address of server */ - char *srbPort; /* SRB host port number */ - char *srbAuth; /* SRB Authentication-password */ - int storSysType; /* Storage Type: 0=Unix, 1=UniTree, 2=HPSS, - * 3=FTP, 4=HTTP */ - int mode; /* File mode-Unix access mode */ - int size; /* File Size-Only valid for HPSS, -1 is default */ -} SRB_Info; - -#ifdef __cplusplus -extern "C" { -#endif - -H5_DLL hid_t H5FD_srb_init(void); -H5_DLL void H5FD_srb_term(void); -H5_DLL herr_t H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info); -H5_DLL herr_t H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info); - -#ifdef __cplusplus -} -#endif - -#else -#define H5FD_SRB (-1) -#endif /* H5_HAVE_SRB */ - -#endif /* H5FDsrb_H */ diff --git a/src/H5config.h.in b/src/H5config.h.in index b87764a..fd3e1d7 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -75,9 +75,6 @@ /* Define if the compiler understand the __FUNCTION__ keyword */ #undef HAVE_FUNCTION -/* Define if the Globus GASS is defined */ -#undef HAVE_GASS - /* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */ #undef HAVE_GETCONSOLESCREENBUFFERINFO @@ -99,9 +96,6 @@ /* Define to 1 if you have the `get_fpc_csr' function. */ #undef HAVE_GET_FPC_CSR -/* Define to 1 if you have the <globus_common.h> header file. */ -#undef HAVE_GLOBUS_COMMON_H - /* Define if we have GPFS support */ #undef HAVE_GPFS @@ -121,47 +115,9 @@ /* Define to 1 if you have the <io.h> header file. */ #undef HAVE_IO_H -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ #undef HAVE_LIBDMALLOC -/* Define to 1 if you have the `elf' library (-lelf). */ -#undef HAVE_LIBELF - -/* Define to 1 if you have the `globus_common' library (-lglobus_common). */ -#undef HAVE_LIBGLOBUS_COMMON - -/* Define to 1 if you have the `globus_gaa' library (-lglobus_gaa). */ -#undef HAVE_LIBGLOBUS_GAA - -/* Define to 1 if you have the `globus_gass_cache' library - (-lglobus_gass_cache). */ -#undef HAVE_LIBGLOBUS_GASS_CACHE - -/* Define to 1 if you have the `globus_gass_file' library - (-lglobus_gass_file). */ -#undef HAVE_LIBGLOBUS_GASS_FILE - -/* Define to 1 if you have the `globus_gass_transfer' library - (-lglobus_gass_transfer). */ -#undef HAVE_LIBGLOBUS_GASS_TRANSFER - -/* Define to 1 if you have the `globus_gass_transfer_assist' library - (-lglobus_gass_transfer_assist). */ -#undef HAVE_LIBGLOBUS_GASS_TRANSFER_ASSIST - -/* Define to 1 if you have the `globus_gss' library (-lglobus_gss). */ -#undef HAVE_LIBGLOBUS_GSS - -/* Define to 1 if you have the `globus_gss_assist' library - (-lglobus_gss_assist). */ -#undef HAVE_LIBGLOBUS_GSS_ASSIST - -/* Define to 1 if you have the `globus_io' library (-lglobus_io). */ -#undef HAVE_LIBGLOBUS_IO - /* Define to 1 if you have the `lmpe' library (-llmpe). */ #undef HAVE_LIBLMPE @@ -186,15 +142,6 @@ /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD -/* Define to 1 if you have the `socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET - -/* Define to 1 if you have the `SrbClient' library (-lSrbClient). */ -#undef HAVE_LIBSRBCLIENT - -/* Define to 1 if you have the `ssl' library (-lssl). */ -#undef HAVE_LIBSSL - /* Define to 1 if you have the `sz' library (-lsz). */ #undef HAVE_LIBSZ @@ -240,12 +187,6 @@ /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF -/* Define if the SRB is defined */ -#undef HAVE_SRB - -/* Define to 1 if you have the <srbClient.h> header file. */ -#undef HAVE_SRBCLIENT_H - /* Define if `struct stat' has the `st_blocks' field */ #undef HAVE_STAT_ST_BLOCKS diff --git a/src/H5public.h b/src/H5public.h index fba75ab..44ed9d9 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -57,15 +57,6 @@ #endif #endif -#ifdef H5_HAVE_GASS /*for Globus GASS I/O */ -#include "globus_common.h" -#include "globus_gass_file.h" -#endif - -#ifdef H5_HAVE_SRB /*for SRB I/O */ -#include <srbClient.h> -#endif - #include "H5api_adpt.h" #ifdef __cplusplus diff --git a/src/Makefile.in b/src/Makefile.in index fdeb98f..6ba8dbb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -35,8 +35,8 @@ LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5Bcache.c H5C.c H5D.c H5Dcontig.c \ H5Dcompact.c H5Defl.c \ H5Dio.c H5Distore.c H5Dmpio.c H5Dselect.c H5Dtest.c H5E.c H5F.c \ H5Fdbg.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5FD.c \ - H5FDcore.c H5FDfamily.c H5FDgass.c H5FDlog.c H5FDmpi.c H5FDmpio.c \ - H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDsrb.c H5FDstdio.c \ + H5FDcore.c H5FDfamily.c H5FDlog.c H5FDmpi.c H5FDmpio.c \ + H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c \ H5FL.c H5FO.c H5FS.c H5G.c H5Gent.c H5Gname.c \ H5Gnode.c H5Gstab.c \ H5Gtest.c H5Gtraverse.c \ @@ -62,8 +62,8 @@ MOSTLYCLEAN=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Cpublic.h \ H5Dpublic.h \ H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDfamily.h \ - H5FDgass.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \ - H5FDmulti.h H5FDsec2.h H5FDsrb.h H5FDstdio.h \ + H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \ + H5FDmulti.h H5FDsec2.h H5FDstdio.h \ H5Gpublic.h H5HGpublic.h H5HLpublic.h H5Ipublic.h \ H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \ H5Tpublic.h H5Zpublic.h H5pubconf.h hdf5.h H5api_adpt.h @@ -44,12 +44,10 @@ /* Predefined file drivers */ #include "H5FDcore.h" /* Files stored entirely in memory */ #include "H5FDfamily.h" /* File families */ -#include "H5FDgass.h" /* Remote files using GASS I/O */ #include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ #include "H5FDmpi.h" /* MPI-based file drivers */ #include "H5FDmulti.h" /* Usage-partitioned file family */ #include "H5FDsec2.h" /* POSIX unbuffered file I/O */ -#include "H5FDsrb.h" /* Remote access using SRB */ #include "H5FDstdio.h" /* Standard C buffered I/O */ #endif diff --git a/src/hdf5.lnt b/src/hdf5.lnt index b67abc0..f089ffb 100755 --- a/src/hdf5.lnt +++ b/src/hdf5.lnt @@ -92,9 +92,6 @@ macros cleaned up, but have not been linted due to their dependencies on features that we don't support on Windows: H5FDfphdf5.c - H5FDgass.c H5FDmpio.c H5FDmpiposix.c - H5FDsrb.c - H5FDstream.c */ diff --git a/test/Dependencies b/test/Dependencies index bbe3463..0dc9dec 100644 --- a/test/Dependencies +++ b/test/Dependencies @@ -42,14 +42,12 @@ h5test.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -85,14 +83,12 @@ testframe.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h big.lo: \ $(srcdir)/big.c \ @@ -121,14 +117,12 @@ big.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -159,14 +153,12 @@ bittests.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -210,14 +202,12 @@ cache.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -268,14 +258,12 @@ cmpd_dset.lo: \ $(top_srcdir)/src/H5Zpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h dsets.lo: \ @@ -305,14 +293,12 @@ dsets.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -345,14 +331,12 @@ dtypes.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -396,14 +380,12 @@ extend.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -434,14 +416,12 @@ external.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -472,14 +452,12 @@ fillval.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -510,14 +488,12 @@ flush1.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -548,14 +524,12 @@ flush2.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -586,14 +560,12 @@ gheap.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -644,14 +616,12 @@ hyperslab.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -685,14 +655,12 @@ istore.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -750,14 +718,12 @@ lheap.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -792,14 +758,12 @@ links.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -840,14 +804,12 @@ mount.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -881,14 +843,12 @@ mtime.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -919,14 +879,12 @@ ohdr.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -974,14 +932,12 @@ stab.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -1032,14 +988,12 @@ tarray.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h tattr.lo: \ $(srcdir)/tattr.c \ @@ -1073,14 +1027,12 @@ tattr.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h tconfig.lo: \ $(srcdir)/tconfig.c \ @@ -1108,14 +1060,12 @@ tconfig.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/testhdf5.h \ $(top_srcdir)/src/H5private.h \ @@ -1123,6 +1073,45 @@ tconfig.lo: \ $(top_srcdir)/src/H5Eprivate.h \ $(top_srcdir)/src/H5private.h \ $(srcdir)/h5test.h +tcoords.lo: \ + $(srcdir)/tcoords.c \ + $(srcdir)/testhdf5.h \ + $(top_srcdir)/src/H5private.h \ + $(top_srcdir)/src/H5public.h \ + $(top_builddir)/src/H5pubconf.h \ + $(top_srcdir)/src/H5api_adpt.h \ + $(top_srcdir)/src/H5MPprivate.h \ + $(top_srcdir)/src/H5Eprivate.h \ + $(top_srcdir)/src/H5Epublic.h \ + $(top_srcdir)/src/H5Ipublic.h \ + $(top_srcdir)/src/H5private.h \ + $(srcdir)/h5test.h \ + $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/src/H5Apublic.h \ + $(top_srcdir)/src/H5ACpublic.h \ + $(top_srcdir)/src/H5Bpublic.h \ + $(top_srcdir)/src/H5Dpublic.h \ + $(top_srcdir)/src/H5Fpublic.h \ + $(top_srcdir)/src/H5FDpublic.h \ + $(top_srcdir)/src/H5Gpublic.h \ + $(top_srcdir)/src/H5Opublic.h \ + $(top_srcdir)/src/H5HGpublic.h \ + $(top_srcdir)/src/H5HLpublic.h \ + $(top_srcdir)/src/H5MMpublic.h \ + $(top_srcdir)/src/H5Ppublic.h \ + $(top_srcdir)/src/H5Zpublic.h \ + $(top_srcdir)/src/H5Rpublic.h \ + $(top_srcdir)/src/H5Spublic.h \ + $(top_srcdir)/src/H5Tpublic.h \ + $(top_srcdir)/src/H5FDcore.h \ + $(top_srcdir)/src/H5FDfamily.h \ + $(top_srcdir)/src/H5FDlog.h \ + $(top_srcdir)/src/H5FDmpi.h \ + $(top_srcdir)/src/H5FDmpio.h \ + $(top_srcdir)/src/H5FDmpiposix.h \ + $(top_srcdir)/src/H5FDmulti.h \ + $(top_srcdir)/src/H5FDsec2.h \ + $(top_srcdir)/src/H5FDstdio.h testhdf5.lo: \ $(srcdir)/testhdf5.c \ $(srcdir)/testhdf5.h \ @@ -1155,14 +1144,12 @@ testhdf5.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h testmeta.lo: \ $(srcdir)/testmeta.c \ @@ -1190,14 +1177,12 @@ testmeta.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h tfile.lo: \ $(srcdir)/tfile.c \ @@ -1225,14 +1210,12 @@ tfile.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/testhdf5.h \ $(top_srcdir)/src/H5private.h \ @@ -1287,14 +1270,12 @@ tgenprop.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5Dprivate.h \ $(top_srcdir)/src/H5FDprivate.h \ @@ -1347,14 +1328,12 @@ th5s.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5Bprivate.h \ $(top_srcdir)/src/H5ACprivate.h \ @@ -1405,14 +1384,12 @@ theap.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5HPprivate.h titerate.lo: \ @@ -1447,14 +1424,12 @@ titerate.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h tmeta.lo: \ $(srcdir)/tmeta.c \ @@ -1488,14 +1463,12 @@ tmeta.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5Fprivate.h tmisc.lo: \ @@ -1524,14 +1497,12 @@ tmisc.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/testhdf5.h \ $(top_srcdir)/src/H5private.h \ @@ -1589,14 +1560,12 @@ trefer.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h trefstr.lo: \ $(srcdir)/trefstr.c \ @@ -1630,14 +1599,12 @@ trefstr.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FLprivate.h \ $(top_srcdir)/src/H5RSprivate.h @@ -1673,14 +1640,12 @@ tselect.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5Spkg.h \ $(top_srcdir)/src/H5Sprivate.h \ @@ -1730,14 +1695,12 @@ tskiplist.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5SLprivate.h ttime.lo: \ @@ -1772,14 +1735,12 @@ ttime.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h ttst.lo: \ $(srcdir)/ttst.c \ @@ -1813,14 +1774,12 @@ ttst.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5STprivate.h tvltypes.lo: \ @@ -1855,14 +1814,12 @@ tvltypes.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5Dprivate.h \ $(top_srcdir)/src/H5FDprivate.h \ @@ -1913,14 +1870,12 @@ tvlstr.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h unlink.lo: \ $(srcdir)/unlink.c \ @@ -1949,14 +1904,12 @@ unlink.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -1987,14 +1940,12 @@ enum.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -2025,14 +1976,12 @@ ttsafe.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -2067,14 +2016,12 @@ ttsafe_dcreate.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -2109,14 +2056,12 @@ ttsafe_error.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -2151,14 +2096,12 @@ ttsafe_cancel.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -2193,14 +2136,12 @@ ttsafe_acreate.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -2208,234 +2149,6 @@ ttsafe_acreate.lo: \ $(top_srcdir)/src/H5private.h \ $(srcdir)/testhdf5.h \ $(srcdir)/h5test.h -gass_write.lo: \ - $(srcdir)/gass_write.c \ - $(srcdir)/h5test.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5public.h \ - $(top_builddir)/src/H5pubconf.h \ - $(top_srcdir)/src/H5api_adpt.h \ - $(top_srcdir)/src/H5Apublic.h \ - $(top_srcdir)/src/H5Ipublic.h \ - $(top_srcdir)/src/H5ACpublic.h \ - $(top_srcdir)/src/H5Bpublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5Epublic.h \ - $(top_srcdir)/src/H5Fpublic.h \ - $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5Opublic.h \ - $(top_srcdir)/src/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ - $(top_srcdir)/src/H5Rpublic.h \ - $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5FDcore.h \ - $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5FDmpi.h \ - $(top_srcdir)/src/H5FDmpio.h \ - $(top_srcdir)/src/H5FDmpiposix.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5private.h \ - $(top_srcdir)/src/H5MPprivate.h -gass_read.lo: \ - $(srcdir)/gass_read.c \ - $(srcdir)/h5test.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5public.h \ - $(top_builddir)/src/H5pubconf.h \ - $(top_srcdir)/src/H5api_adpt.h \ - $(top_srcdir)/src/H5Apublic.h \ - $(top_srcdir)/src/H5Ipublic.h \ - $(top_srcdir)/src/H5ACpublic.h \ - $(top_srcdir)/src/H5Bpublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5Epublic.h \ - $(top_srcdir)/src/H5Fpublic.h \ - $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5Opublic.h \ - $(top_srcdir)/src/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ - $(top_srcdir)/src/H5Rpublic.h \ - $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5FDcore.h \ - $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5FDmpi.h \ - $(top_srcdir)/src/H5FDmpio.h \ - $(top_srcdir)/src/H5FDmpiposix.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5private.h \ - $(top_srcdir)/src/H5MPprivate.h -gass_append.lo: \ - $(srcdir)/gass_append.c \ - $(srcdir)/h5test.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5public.h \ - $(top_builddir)/src/H5pubconf.h \ - $(top_srcdir)/src/H5api_adpt.h \ - $(top_srcdir)/src/H5Apublic.h \ - $(top_srcdir)/src/H5Ipublic.h \ - $(top_srcdir)/src/H5ACpublic.h \ - $(top_srcdir)/src/H5Bpublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5Epublic.h \ - $(top_srcdir)/src/H5Fpublic.h \ - $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5Opublic.h \ - $(top_srcdir)/src/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ - $(top_srcdir)/src/H5Rpublic.h \ - $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5FDcore.h \ - $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5FDmpi.h \ - $(top_srcdir)/src/H5FDmpio.h \ - $(top_srcdir)/src/H5FDmpiposix.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5private.h \ - $(top_srcdir)/src/H5MPprivate.h -srb_read.lo: \ - $(srcdir)/srb_read.c \ - $(srcdir)/h5test.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5public.h \ - $(top_builddir)/src/H5pubconf.h \ - $(top_srcdir)/src/H5api_adpt.h \ - $(top_srcdir)/src/H5Apublic.h \ - $(top_srcdir)/src/H5Ipublic.h \ - $(top_srcdir)/src/H5ACpublic.h \ - $(top_srcdir)/src/H5Bpublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5Epublic.h \ - $(top_srcdir)/src/H5Fpublic.h \ - $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5Opublic.h \ - $(top_srcdir)/src/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ - $(top_srcdir)/src/H5Rpublic.h \ - $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5FDcore.h \ - $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5FDmpi.h \ - $(top_srcdir)/src/H5FDmpio.h \ - $(top_srcdir)/src/H5FDmpiposix.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5private.h \ - $(top_srcdir)/src/H5MPprivate.h -srb_write.lo: \ - $(srcdir)/srb_write.c \ - $(srcdir)/h5test.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5public.h \ - $(top_builddir)/src/H5pubconf.h \ - $(top_srcdir)/src/H5api_adpt.h \ - $(top_srcdir)/src/H5Apublic.h \ - $(top_srcdir)/src/H5Ipublic.h \ - $(top_srcdir)/src/H5ACpublic.h \ - $(top_srcdir)/src/H5Bpublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5Epublic.h \ - $(top_srcdir)/src/H5Fpublic.h \ - $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5Opublic.h \ - $(top_srcdir)/src/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ - $(top_srcdir)/src/H5Rpublic.h \ - $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5FDcore.h \ - $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5FDmpi.h \ - $(top_srcdir)/src/H5FDmpio.h \ - $(top_srcdir)/src/H5FDmpiposix.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5private.h \ - $(top_srcdir)/src/H5MPprivate.h -srb_append.lo: \ - $(srcdir)/srb_append.c \ - $(srcdir)/h5test.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5public.h \ - $(top_builddir)/src/H5pubconf.h \ - $(top_srcdir)/src/H5api_adpt.h \ - $(top_srcdir)/src/H5Apublic.h \ - $(top_srcdir)/src/H5Ipublic.h \ - $(top_srcdir)/src/H5ACpublic.h \ - $(top_srcdir)/src/H5Bpublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5Epublic.h \ - $(top_srcdir)/src/H5Fpublic.h \ - $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5Opublic.h \ - $(top_srcdir)/src/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ - $(top_srcdir)/src/H5Rpublic.h \ - $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5FDcore.h \ - $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5FDmpi.h \ - $(top_srcdir)/src/H5FDmpio.h \ - $(top_srcdir)/src/H5FDmpiposix.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5private.h \ - $(top_srcdir)/src/H5MPprivate.h set_extent.lo: \ $(srcdir)/set_extent.c \ $(top_srcdir)/src/hdf5.h \ @@ -2462,14 +2175,12 @@ set_extent.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5test.h \ $(top_srcdir)/src/H5private.h \ @@ -2501,14 +2212,12 @@ getname.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -2554,14 +2263,12 @@ file_handle.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -2592,14 +2299,12 @@ ntypes.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -2630,14 +2335,12 @@ dangle.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -2668,14 +2371,12 @@ reserved.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h diff --git a/test/Makefile.in b/test/Makefile.in index bf45712..d43b2eb 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -27,8 +27,8 @@ CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@ ## executed, generally most specific tests to least specific tests. TEST_PROGS=testhdf5 lheap ohdr stab gheap cache hyperslab istore bittests \ dtypes dsets cmpd_dset extend external links unlink big mtime fillval \ - mount flush1 flush2 enum gass_write gass_read gass_append set_extent \ - srb_write srb_append srb_read ttsafe getname file_handle \ + mount flush1 flush2 enum set_extent \ + ttsafe getname file_handle \ ntypes dangle reserved TIMINGS=testmeta @@ -78,8 +78,7 @@ TEST_SRC=big.c bittests.c cache.c cmpd_dset.c dsets.c dtypes.c extend.c \ tgenprop.c th5s.c theap.c titerate.c tmeta.c tmisc.c trefer.c trefstr.c \ tselect.c tskiplist.c ttime.c ttst.c tvltypes.c tvlstr.c \ unlink.c enum.c ttsafe.c ttsafe_dcreate.c ttsafe_error.c \ - ttsafe_cancel.c ttsafe_acreate.c gass_write.c gass_read.c \ - gass_append.c srb_read.c srb_write.c srb_append.c \ + ttsafe_cancel.c ttsafe_acreate.c \ set_extent.c getname.c file_handle.c ntypes.c dangle.c reserved.c TEST_OBJ=$(TEST_SRC:.c=.lo) @@ -189,27 +188,9 @@ enum: enum.lo ttsafe: $(TTS_OBJ) @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TTS_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) -gass_write: gass_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - -gass_read: gass_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - -gass_append: gass_append.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - set_extent: set_extent.lo @$(LT_LINK_EXE) $(CFLAGS) -o $@ set_extent.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) -srb_read: srb_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ srb_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - -srb_write: srb_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ srb_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - -srb_append: srb_append.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ srb_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - testmeta: testmeta.lo @$(LT_LINK_EXE) $(CFLAGS) -o $@ testmeta.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) diff --git a/test/gass_append.c b/test/gass_append.c deleted file mode 100644 index 099f10c..0000000 --- a/test/gass_append.c +++ /dev/null @@ -1,170 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Saurabh Bagchi (bagchi@uiuc.edu) - * Wednesday, August 11, 1999. - * - * Modifications: Saurabh Bagchi (Aug 17, 1999) - * Modified to work with VFL (HDF51.3). - */ - -/* Test the following functionality of the GASS driver. - 1. Open a remote file for append. - 2. Create a new dataset within the file. - 3. Create a local memory buffer to hold the data. - 4. Write the local data to the remote dataset. -*/ -#include "h5test.h" - -#ifndef H5_HAVE_GASS -int main(void) -{ - printf("Test skipped because GASS driver not available\n"); - return 0; -} -#else - -#ifdef hide - -#define URL "ftp://gass:gass12@which/tmp/gass/junk.w" -#define DATASETNAME "Int1Array" -#define NX 5 /* dataset dimensions */ -#define NY 6 -#define RANK 2 - -int main (void) -{ - - hid_t fapl =-1, file; - hid_t dataspace, datatype, dataset; - hsize_t dimsf[2]; - - herr_t status = 0; - int data[NX][NY]; /* data to write */ - int i, j; - GASS_Info ginf; - - /* - * Data and output buffer initialization. - */ - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) - data[j][i] = i*i + j*j; - } - /* - * 0 1 4 9 16 25 - * 1 2 5 10 17 26 - * 4 5 8 13 20 29 - * 9 10 13 18 25 34 - * 16 17 20 25 32 41 - */ - - /* Create access property list and set the driver to GASS */ - fapl = H5Pcreate (H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - - ginf.block_size = 0; - ginf.max_length =0; - /* ginf = GASS_INFO_NULL; */ - - status = H5Pset_fapl_gass (fapl, ginf); - if (status < 0) { - printf ("H5Pset_fapl_gass failed. \n"); - return -1; - } - - /* - * Open an existing file using H5F_ACC_RDWR access, - * and gass file access properties. - */ - file = H5Fopen(URL, H5F_ACC_RDWR, fapl); - if (file < 0) { - printf ("H5Fopen failed. \n"); - return -1; - } - - /* - * Describe the size of the array and create the data space for fixed - * size dataset. - */ - dimsf[0] = NX; - dimsf[1] = NY; - dataspace = H5Screate_simple(RANK, dimsf, NULL); - if (dataspace < 0) { - printf ("H5Screate failed. \n"); - return -1; - } - - /* - * Define datatype for the data in the file. - * We will store little endian INT numbers. - */ - datatype = H5Tcopy(H5T_NATIVE_INT); - if (datatype < 0) { - printf ("H5Tcopy failed. \n"); - return -1; - } - - status = H5Tset_order(datatype, H5T_ORDER_LE); - if (status < 0) { - printf ("H5Tset_order failed. \n"); - return -1; - } - - /* - * Create a new dataset within the file using defined dataspace and - * datatype and default dataset creation properties. - */ - dataset = H5Dcreate(file, DATASETNAME, datatype, dataspace, - H5P_DEFAULT); - if (dataset < 0) { - printf ("H5Dcreate failed. \n"); - return -1; - } - - /* - * Write the data to the dataset using default transfer properties. - */ - status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, data); - if (status < 0) { - printf ("H5Dwrite failed. \n"); - return -1; - } - - /* - * Close/release resources. - */ - H5Sclose(dataspace); - H5Tclose(datatype); - H5Dclose(dataset); - H5Fclose(file); - H5Pclose(fapl); - - return 0; -} - -#else -int main(void) -{ - printf("Test skipped because append depends on web server!\n"); - return 0; -} -#endif -#endif diff --git a/test/gass_read.c b/test/gass_read.c deleted file mode 100644 index 23b2294..0000000 --- a/test/gass_read.c +++ /dev/null @@ -1,213 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Saurabh Bagchi (bagchi@uiuc.edu) - * Wednesday, August 11, 1999. - * - * Modifications: Saurabh Bagchi (Aug 17, 1999) - * Modified to work with VFL (HDF51.3). - */ - -/* Test the following functionality of the GASS driver. - 1. Open a remote file for read (the dataset was written using gass_write.c). - 2. Create a memory buffer to hold the dataset. - 3. Read the dataset into the memory buffer. - 4. Get some information about the dataset from the file. -*/ -#include "h5test.h" -#include <string.h> - -#ifndef H5_HAVE_GASS -int main(void) -{ - printf("Test skipped because GASS driver not available\n"); - return 0; -} -#else - -/*#define URL "ftp://gass:gass12@which/tmp/gass/junk.w"*/ -/*#define URL "http://paz.ncsa.uiuc.edu:8080/test/a.h5"*/ -#define URL "http://hdf.ncsa.uiuc.edu/GLOBUS/a.h5" -/* #define DATASETNAME "Int1Array" */ -#define NX_SUB 3 /* hyperslab dimensions */ -#define NY_SUB 4 -#define NX 7 /* output buffer dimensions */ -#define NY 7 -#define NZ 3 -#define RANK 2 -#define RANK_OUT 3 - -int -main (int argc, char **argv) -{ - hid_t fapl = -1, file, dataset; /* handles */ - char DATASETNAME[32]; - hid_t datatype, dataspace; - hid_t memspace; - H5T_class_t class; /* data type class */ - H5T_order_t order; /* data order */ - size_t size; /* - * size of the data element - * stored in file - */ - hsize_t dimsm[3]; /* memory space dimensions */ - hsize_t dims_out[2]; /* dataset dimensions */ - herr_t status; - - int data_out[NX][NY][NZ ]; /* output buffer */ - - hsize_t count[2]; /* size of the hyperslab in the file */ - hssize_t offset[2]; /* hyperslab offset in the file */ - hsize_t count_out[3]; /* size of the hyperslab in memory */ - hssize_t offset_out[3]; /* hyperslab offset in memory */ - int i, j, k, status_n, rank; - GASS_Info ginf; - - if (argc > 2) { - printf ("Incorrect command line. \n"); - printf ("Correct command line: %s [DATASET NAME] \n", argv[0]); - printf ("The two datasets present in the file are: \"IntArray\" and " - "\"Int1Array\"\n"); - exit(1); - } - - printf ("Correct command line: %s [DATASET NAME] \n", argv[0]); - printf ("The two datasets present in the file are: \"IntArray\" and " - "\"Int1Array\"\n"); - printf ("Default dataset is IntArray. \n"); - - if (argc == 1) - strcpy (DATASETNAME, "IntArray"); - else if (!strcmp(argv[1],"IntArray") || !strcmp(argv[1],"Int1Array")) - strcpy (DATASETNAME, argv[1]); - else - strcpy (DATASETNAME, "IntArray"); - printf ("\n Reading dataset %s \n\n", DATASETNAME); - - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) { - for (k = 0; k < NZ ; k++) - data_out[j][i][k] = 0; - } - } - - /* Create access property list and set the driver to GASS */ - fapl = H5Pcreate (H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - - - ginf.block_size = 0; - ginf.max_length =0; - - /* ginf = GASS_INFO_NULL; */ - - status = H5Pset_fapl_gass (fapl, ginf); - if (status < 0) { - printf ("H5Pset_fapl_gass failed. \n"); - return -1; - } - - /* - * Open the file and the dataset. - */ - file = H5Fopen(URL, H5F_ACC_RDONLY, fapl); - dataset = H5Dopen(file, DATASETNAME); - - /* - * Get datatype and dataspace handles and then query - * dataset class, order, size, rank and dimensions. - */ - datatype = H5Dget_type(dataset); /* datatype handle */ - class = H5Tget_class(datatype); - if (class == H5T_INTEGER) printf("Data set has INTEGER type \n"); - order = H5Tget_order(datatype); - if (order == H5T_ORDER_LE) printf("Little endian order \n"); - - size = H5Tget_size(datatype); - printf(" Data size is %d \n", size); - - dataspace = H5Dget_space(dataset); /* dataspace handle */ - rank = H5Sget_simple_extent_ndims(dataspace); - status_n = H5Sget_simple_extent_dims(dataspace, dims_out, NULL); - printf("rank %d, dimensions %lu x %lu \n", rank, - (unsigned long)(dims_out[0]), (unsigned long)(dims_out[1])); - - /* - * Define hyperslab in the dataset. - */ - offset[0] = 1; - offset[1] = 2; - count[0] = NX_SUB; - count[1] = NY_SUB; - status = H5Sselect_hyperslab(dataspace, H5S_SELECT_SET, offset, NULL, - count, NULL); - - /* - * Define the memory dataspace. - */ - dimsm[0] = NX; - dimsm[1] = NY; - dimsm[2] = NZ ; - memspace = H5Screate_simple(RANK_OUT,dimsm,NULL); - - /* - * Define memory hyperslab. - */ - offset_out[0] = 3; - offset_out[1] = 0; - offset_out[2] = 0; - count_out[0] = NX_SUB; - count_out[1] = NY_SUB; - count_out[2] = 1; - status = H5Sselect_hyperslab(memspace, H5S_SELECT_SET, offset_out, NULL, - count_out, NULL); - - /* - * Read data from hyperslab in the file into the hyperslab in - * memory and display. - */ - status = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace, - H5P_DEFAULT, data_out); - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) printf("%d ", data_out[j][i][0]); - printf("\n"); - } - /* - * 0 0 0 0 0 0 0 - * 0 0 0 0 0 0 0 - * 0 0 0 0 0 0 0 - * 3 4 5 6 0 0 0 - * 4 5 6 7 0 0 0 - * 5 6 7 8 0 0 0 - * 0 0 0 0 0 0 0 - */ - - /* - * Close/release resources. - */ - H5Tclose(datatype); - H5Dclose(dataset); - H5Sclose(dataspace); - H5Sclose(memspace); - H5Fclose(file); - H5Pclose(fapl); - - return 0; -} -#endif diff --git a/test/gass_write.c b/test/gass_write.c deleted file mode 100644 index 8154e66..0000000 --- a/test/gass_write.c +++ /dev/null @@ -1,180 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Saurabh Bagchi (bagchi@uiuc.edu) - * Friday, August 6, 1999. - * - * Modifications: Saurabh Bagchi (Aug 17, 1999) - * Modified to work with VFL (HDF51.3). - */ - -/* Test the following functionality of the GASS driver. - 1. Open a remote file for write. - 2. Create a new dataset within the file. - 3. Create a local memory buffer to hold the data. - 4. Write the local data to the remote dataset. -*/ -#include "h5test.h" - -#ifndef H5_HAVE_GASS -int main(void) -{ - printf("Test skipped because GASS driver not available\n"); - return 0; -} -#else - -#ifdef hide - -/*#define URL "ftp://gass:gass12@which/tmp/gass/junk.w"*/ -#define URL "http://paz.ncsa.uiuc.edu:8080/test/put/test/b.h5" - -#define DATASETNAME "IntArray" -#define NX 5 /* dataset dimensions */ -#define NY 6 -#define RANK 2 - -int main (void) -{ - - hid_t fapl =-1, file; - hid_t dataspace, datatype, dataset; - hsize_t dimsf[2]; - - herr_t status = 0; - int data[NX][NY]; /* data to write */ - int i, j; - GASS_Info ginf; - - /* - * Data and output buffer initialization. - */ - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) - data[j][i] = i + j; - } - /* - * 0 1 2 3 4 5 - * 1 2 3 4 5 6 - * 2 3 4 5 6 7 - * 3 4 5 6 7 8 - * 4 5 6 7 8 9 - */ - - /* Create access property list and set the driver to GASS */ - fapl = H5Pcreate (H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - - ginf.block_size = 0; - ginf.max_length =0; - /* ginf = GASS_INFO_NULL;*/ - - status = H5Pset_fapl_gass (fapl, ginf); - if (status < 0) { - printf ("H5Pset_fapl_gass failed. \n"); - return -1; - } - - /* - * Create a new file using H5F_ACC_TRUNC access, - * default file creation properties, and gass file - * access properties. - */ - /* - // file = H5Fcreate(URL, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); - // Works. Truncates existing files. - // file = H5Fcreate(URL, H5F_ACC_EXCL, H5P_DEFAULT, fapl); - // Works. Croaks if existing file, else creates. - // Any other flag has no effect as long as one and exactly one of TRUNC/ - // EXCL is there */ - /* printf ("I'm here just before H5Fcreate. \n");*/ - file = H5Fcreate(URL, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); - if (file < 0) { - printf ("H5Fcreate failed. \n"); - return -1; - } - - /* - * Describe the size of the array and create the data space for fixed - * size dataset. - */ - dimsf[0] = NX; - dimsf[1] = NY; - dataspace = H5Screate_simple(RANK, dimsf, NULL); - if (dataspace < 0) { - printf ("H5Screate failed. \n"); - return -1; - } - - /* - * Define datatype for the data in the file. - * We will store little endian INT numbers. - */ - datatype = H5Tcopy(H5T_NATIVE_INT); - if (datatype < 0) { - printf ("H5Tcopy failed. \n"); - return -1; - } - - status = H5Tset_order(datatype, H5T_ORDER_LE); - if (status < 0) { - printf ("H5Tset_order failed. \n"); - return -1; - } - - /* - * Create a new dataset within the file using defined dataspace and - * datatype and default dataset creation properties. - */ - dataset = H5Dcreate(file, DATASETNAME, datatype, dataspace, - H5P_DEFAULT); - if (dataset < 0) { - printf ("H5Dcreate failed. \n"); - return -1; - } - - /* - * Write the data to the dataset using default transfer properties. - */ - status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, data); - if (status < 0) { - printf ("H5Dwrite failed. \n"); - return -1; - } - - /* - * Close/release resources. - */ - H5Sclose(dataspace); - H5Tclose(datatype); - H5Dclose(dataset); - H5Fclose(file); - H5Pclose(fapl); - - return 0; -} -#else -int main(void) -{ - printf("Test skipped because writing depends on web server!\n"); - return 0; -} -#endif -#endif diff --git a/test/srb_append.c b/test/srb_append.c deleted file mode 100644 index 0bee3d3..0000000 --- a/test/srb_append.c +++ /dev/null @@ -1,197 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Raymond Lu <slu@ncsa.uiuc.edu> - * April 14, 2000 - * - * Purpose: Test HDF-SRB if it is configured and compiled. Append an - * integer dataset to an existent HDF5 file with an integer array - * on SRB server. - * - * Usage: The HDF5 is built on the top of SRB. So you just need to - * activate a connection to SRB server by calling function - * H5Pset_fapl_srb()(after creating file property list by calling - * H5Pcreate()). All server information is passed in through its - * parameter SRB_Info(a structure). Its fields are - * char *srbHost: SRB host address of server. If the input is - * NULL, it will use the environment varible "srbHost" if - * it is defined. If it is not defined, the - * ~/.srb/.MdasEnd file will be checked next. If not, it - * will use the hostname of the client machine. - * char *srbPort: SRB host port number of server. If the - * input value is NULL, it will use the env variable - * "srbPort" if it is defined. If not, it defaults to - * 5558. - * char *srbAuth: SRB Authentication-password. It is used to - * define password for MDAS or SEA authentication. - * For SEA authentication, this is the password used by - * the SEA library to decrypt the encrypted private key - * stored in the file ~/.SEAuuuuu@ddddd(where uuuuu is - * the user ID and ddddd is the user domain name). This - * input is not needed if an unencrypted private key is - * available in the /tmp directory(generated using the - * 'seaauth auto' command). To provide additional - * flexibility, a client may also use the environment - * variable "srbAuth" to specify the password. A client - * may also supply the password in the ~/.srb/.MdasAuth - * file. If a client uses more than one method to specfy - * the password, the value given in this function call - * will take precedent, then the environment variable - * "srbAuth", and lastly, the ~/.srb/.MdasAuth file. - * int storSysType: Storage system type on SRB server. - * 0=Unix, 1=UniTree, 2=HPSS, 3=FTP, 4=HTTP - * int mode: File access mode, same definition with Unix. - * int size: File Size, only valid for HPSS, -1 is default - * - * Then you can open an HDF5 file by calling H5Fopen(). When - * you pass in the file name, it has to be file name with an - * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your - * home directory is possibly in /projects/mdas/srb/SRBVault/. - */ -#include "h5test.h" - -#ifndef H5_HAVE_SRB -int main(void) -{ - printf("Test skipped because SRB driver not available\n"); - return 0; -} -#else - -#define fileName "/projects/mdas/srb/SRBVault/slu.ncsa/a.h5" -#define DATASETNAME "Int1Array" -#define NX 5 /* dataset dimensions */ -#define NY 6 -#define RANK 2 - -int main(void) -{ - SRB_Info srb_info={ NULL, /* Use the server name in ~/.srb/MdasEnv */ - NULL, /* Use the server port number in - * ~/.srb/MdasEnv */ - NULL, /* Use the password in ~/.srb/MdasAuth */ - 0, /* Using Unix storage system. */ - 0600, /* Open file for read and write for owner */ - -1 /* default */ - }; - hid_t fapl =-1, file; - hid_t dataspace, datatype, dataset; - hsize_t dimsf[2]; - - herr_t status = 0; - int data[NX][NY]; /* data to write */ - int i, j; - - /* - * Data and output buffer initialization. - */ - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) - data[j][i] = i*i + j*j; - } - /* - * 0 1 4 9 16 25 - * 1 2 5 10 17 26 - * 4 5 8 13 20 29 - * 9 10 13 18 25 34 - * 16 17 20 25 32 41 - */ - - /* Create access property list and set the driver to GASS */ - fapl = H5Pcreate (H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - status = H5Pset_fapl_srb (fapl, srb_info); - if (status < 0) { - printf ("H5Pset_fapl_gass failed. \n"); - return -1; - } - - /* - * Open an existing file using H5F_ACC_RDWR access, - * and srb file access properties. - */ - file = H5Fopen(fileName, H5F_ACC_RDWR, fapl); - if (file < 0) { - printf ("H5Fopen failed. \n"); - return -1; - } - - /* - * Describe the size of the array and create the data space for fixed - * size dataset. - */ - dimsf[0] = NX; - dimsf[1] = NY; - dataspace = H5Screate_simple(RANK, dimsf, NULL); - if (dataspace < 0) { - printf ("H5Screate failed. \n"); - return -1; - } - - /* - * Define datatype for the data in the file. - * We will store little endian INT numbers. - */ - datatype = H5Tcopy(H5T_NATIVE_INT); - if (datatype < 0) { - printf ("H5Tcopy failed. \n"); - return -1; - } - - status = H5Tset_order(datatype, H5T_ORDER_LE); - if (status < 0) { - printf ("H5Tset_order failed. \n"); - return -1; - } - - /* - * Create a new dataset within the file using defined dataspace and - * datatype and default dataset creation properties. - */ - dataset = H5Dcreate(file, DATASETNAME, datatype, dataspace, - H5P_DEFAULT); - if (dataset < 0) { - printf ("H5Dcreate failed. \n"); - return -1; - } - - /* - * Write the data to the dataset using default transfer properties. - */ - status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, data); - if (status < 0) { - printf ("H5Dwrite failed. \n"); - return -1; - } - - /* - * Close/release resources. - */ - H5Sclose(dataspace); - H5Tclose(datatype); - H5Dclose(dataset); - H5Fclose(file); - H5Pclose(fapl); - - printf("Test finished!\n"); - return 0; -} - -#endif diff --git a/test/srb_read.c b/test/srb_read.c deleted file mode 100644 index 36fad3a..0000000 --- a/test/srb_read.c +++ /dev/null @@ -1,226 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Raymond Lu <slu@ncsa.uiuc.edu> - * April 14, 2000 - * - * Purpose: Test HDF-SRB if it is configured and compiled. Read a chunk of - * dataset of an HDF5 file with an integer array on SRB server, - * using hyperslab. - * Usage: The HDF5 is built on the top of SRB. So you just need to - * activate a connection to SRB server by calling function - * H5Pset_fapl_srb()(after creating file property list by calling - * H5Pcreate()). All server information is passed in through its - * parameter SRB_Info(a structure). Its fields are - * char *srbHost: SRB host address of server. If the input is - * NULL, it will use the environment varible "srbHost" if - * it is defined. If it is not defined, the - * ~/.srb/.MdasEnd file will be checked next. If not, it - * will use the hostname of the client machine. - * char *srbPort: SRB host port number of server. If the - * input value is NULL, it will use the env variable - * "srbPort" if it is defined. If not, it defaults to - * 5558. - * char *srbAuth: SRB Authentication-password. It is used to - * define password for MDAS or SEA authentication. - * For SEA authentication, this is the password used by - * the SEA library to decrypt the encrypted private key - * stored in the file ~/.SEAuuuuu@ddddd(where uuuuu is - * the user ID and ddddd is the user domain name). This - * input is not needed if an unencrypted private key is - * available in the /tmp directory(generated using the - * 'seaauth auto' command). To provide additional - * flexibility, a client may also use the environment - * variable "srbAuth" to specify the password. A client - * may also supply the password in the ~/.srb/.MdasAuth - * file. If a client uses more than one method to specfy - * the password, the value given in this function call - * will take precedent, then the environment variable - * "srbAuth", and lastly, the ~/.srb/.MdasAuth file. - * int storSysType: Storage system type on SRB server. - * 0=Unix, 1=UniTree, 2=HPSS, 3=FTP, 4=HTTP - * int mode: File access mode, same definition with Unix. - * int size: File Size, only valid for HPSS, -1 is default - * - * Then you can open an HDF5 file by calling H5Fopen(). When - * you pass in the file name, it has to be file name with an - * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your - * home directory is possibly in /projects/mdas/srb/SRBVault/. - */ -#include "h5test.h" - -#ifndef H5_HAVE_SRB -int main(void) -{ - printf("Test skipped because SRB driver not available\n"); - return 0; -} -#else - -#define fileName "/projects/mdas/srb/SRBVault/slu.ncsa/a.h5" -#define DATASETNAME "IntArray" -#define NX_SUB 3 /* hyperslab dimensions */ -#define NY_SUB 4 -#define NX 7 /* output buffer dimensions */ -#define NY 7 -#define NZ 3 -#define RANK 2 -#define RANK_OUT 3 - -int main(void) -{ - hid_t fapl=-1, fid = -1, dataset; - hid_t datatype, dataspace; - hid_t memspace; - H5T_class_t class; /* data type class */ - H5T_order_t order; /* data order */ - size_t size; /* - * size of the data element - * stored in file - */ - hsize_t dimsm[3]; /* memory space dimensions */ - hsize_t dims_out[2]; /* dataset dimensions */ - herr_t status; - - int data_out[NX][NY][NZ ]; /* output buffer */ - - hsize_t count[2]; /* size of the hyperslab in the file */ - hssize_t offset[2]; /* hyperslab offset in the file */ - hsize_t count_out[3]; /* size of the hyperslab in memory */ - hssize_t offset_out[3]; /* hyperslab offset in memory */ - int i, j, k, status_n, rank; - SRB_Info srb_info={ NULL, /* Use host name in ~/.srb/.MdasEnv */ - NULL, /* Use environment variable "srbPort" */ - NULL, /* Use password in ~/.srb/.MdasEnv */ - 0, /* Use Unix storage system. */ - 0600, /* File was created for read and write for - * owner */ - -1 /* default */ - }; - - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) { - for (k = 0; k < NZ ; k++) - data_out[j][i][k] = 0; - } - } - - fapl = H5Pcreate(H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - - status = H5Pset_fapl_srb(fapl, srb_info); - if (status < 0) { - printf ("H5Pset_fapl_srb failed. \n"); - return -1; - } - - fid = H5Fopen(fileName, H5F_ACC_RDONLY, fapl); - if (fid < 0) { - printf ("H5Fopen failed. \n"); - return -1; - } - dataset = H5Dopen(fid, DATASETNAME); - if(dataset<0) { - printf ("H5Dopen failed. \n"); - return -1; - } - /* - * Get datatype and dataspace handles and then query - * dataset class, order, size, rank and dimensions. - */ - datatype = H5Dget_type(dataset); /* datatype handle */ - class = H5Tget_class(datatype); - if (class == H5T_INTEGER) printf("Data set has INTEGER type \n"); - order = H5Tget_order(datatype); - if (order == H5T_ORDER_LE) printf("Little endian order \n"); - - size = H5Tget_size(datatype); - printf(" Data size is %d \n", size); - - dataspace = H5Dget_space(dataset); /* dataspace handle */ - rank = H5Sget_simple_extent_ndims(dataspace); - status_n = H5Sget_simple_extent_dims(dataspace, dims_out, NULL); - printf("rank %d, dimensions %lu x %lu \n", rank, - (unsigned long)(dims_out[0]), (unsigned long)(dims_out[1])); - - /* - * Define hyperslab in the dataset. - */ - offset[0] = 1; - offset[1] = 2; - count[0] = NX_SUB; - count[1] = NY_SUB; - status = H5Sselect_hyperslab(dataspace, H5S_SELECT_SET, offset, NULL, - count, NULL); - - /* - * Define the memory dataspace. - */ - dimsm[0] = NX; - dimsm[1] = NY; - dimsm[2] = NZ ; - memspace = H5Screate_simple(RANK_OUT,dimsm,NULL); - - /* - * Define memory hyperslab. - */ - offset_out[0] = 3; - offset_out[1] = 0; - offset_out[2] = 0; - count_out[0] = NX_SUB; - count_out[1] = NY_SUB; - count_out[2] = 1; - status = H5Sselect_hyperslab(memspace, H5S_SELECT_SET, offset_out, NULL, - count_out, NULL); - - /* - * Read data from hyperslab in the file into the hyperslab in - * memory and display. - */ - status = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace, - H5P_DEFAULT, data_out); - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) printf("%d ", data_out[j][i][0]); - printf("\n"); - } - /* - * 0 0 0 0 0 0 0 - * 0 0 0 0 0 0 0 - * 0 0 0 0 0 0 0 - * 3 4 5 6 0 0 0 - * 4 5 6 7 0 0 0 - * 5 6 7 8 0 0 0 - * 0 0 0 0 0 0 0 - */ - - /* - * Close/release resources. - */ - H5Tclose(datatype); - H5Dclose(dataset); - H5Sclose(dataspace); - H5Sclose(memspace); - H5Fclose(fid); - H5Pclose(fapl); - - printf("Test finished!\n"); - return 0; -} - -#endif diff --git a/test/srb_write.c b/test/srb_write.c deleted file mode 100644 index cfdc11d..0000000 --- a/test/srb_write.c +++ /dev/null @@ -1,194 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Programmer: Raymond Lu <slu@ncsa.uiuc.edu> - * April 14, 2000 - * - * Purpose: Test HDF-SRB if it is configured and compiled. Write an HDF5 - * file with an integer array to SRB server. - * - * Usage: The HDF5 is built on the top of SRB. So you just need to - * activate a connection to SRB server by calling function - * H5Pset_fapl_srb()(after creating file property list by calling - * H5Pcreate()). All server information is passed in through its - * parameter SRB_Info(a structure). Its fields are - * char *srbHost: SRB host address of server. If the input is - * NULL, it will use the environment varible "srbHost" if - * it is defined. If it is not defined, the - * ~/.srb/.MdasEnd file will be checked next. If not, it - * will use the hostname of the client machine. - * char *srbPort: SRB host port number of server. If the - * input value is NULL, it will use the env variable - * "srbPort" if it is defined. If not, it defaults to - * 5558. - * char *srbAuth: SRB Authentication-password. It is used to - * define password for MDAS or SEA authentication. - * For SEA authentication, this is the password used by - * the SEA library to decrypt the encrypted private key - * stored in the file ~/.SEAuuuuu@ddddd(where uuuuu is - * the user ID and ddddd is the user domain name). This - * input is not needed if an unencrypted private key is - * available in the /tmp directory(generated using the - * 'seaauth auto' command). To provide additional - * flexibility, a client may also use the environment - * variable "srbAuth" to specify the password. A client - * may also supply the password in the ~/.srb/.MdasAuth - * file. If a client uses more than one method to specfy - * the password, the value given in this function call - * will take precedent, then the environment variable - * "srbAuth", and lastly, the ~/.srb/.MdasAuth file. - * int storSysType: Storage system type on SRB server. - * 0=Unix, 1=UniTree, 2=HPSS, 3=FTP, 4=HTTP - * int mode: File access mode, same definition with Unix. - * int size: File Size, only valid for HPSS, -1 is default - * - * Then you can create an HDF5 file by calling H5Fcreate(). When - * you pass in the file name, it has to be file name with an - * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your - * home directory is possibly in /projects/mdas/srb/SRBVault/. - */ - -#include "h5test.h" - -#ifndef H5_HAVE_SRB -int main(void) -{ - printf("Test skipped because SRB driver not available\n"); - return 0; -} -#else - -#define fileName "/projects/mdas/srb/SRBVault/slu.ncsa/a.h5" -#define DATASETNAME "IntArray" -#define NX 5 /* dataset dimensions */ -#define NY 6 -#define RANK 2 - - -int main(void) -{ - hid_t fapl=-1, fid = -1; - hid_t dataspace, datatype, dataset; - hsize_t dimsf[2]; - herr_t status = 0; - int data[NX][NY]; /* data to write */ - int i, j; - SRB_Info srb_info={ "ghidorah.sdsc.edu", /* Using SDSC SRB server, - * don't append port number. */ - NULL, /* SRB host default port number*/ - NULL, /* SRB Authentication-password, - * using the one in - * ~/.srb/.MdasAuth */ - 0, /* Unix storage system. */ - 0600, /* Read and write only for - * owner */ - -1 /* -1 is default. */ - }; - - /* - * Data and output buffer initialization. - */ - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) - data[j][i] = i + j; - } - /* - * 0 1 2 3 4 5 - * 1 2 3 4 5 6 - * 2 3 4 5 6 7 - * 3 4 5 6 7 8 - * 4 5 6 7 8 9 - */ - - fapl = H5Pcreate(H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - - status = H5Pset_fapl_srb(fapl, srb_info); - if (status < 0) { - printf ("H5Pset_fapl_srb failed. \n"); - return -1; - } - - fid = H5Fcreate(fileName, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); - /*fid = H5Fcreate(fileName, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);*/ - if (fid < 0) { - printf ("H5Fcreate failed. \n"); - return -1; - } - - /* - * Describe the size of the array and create the data space for fixed - * size dataset. - */ - dimsf[0] = NX; - dimsf[1] = NY; - dataspace = H5Screate_simple(RANK, dimsf, NULL); - if (dataspace < 0) { - printf ("H5Screate failed. \n"); - return -1; - } - - /* - * Define datatype for the data in the file. - * We will store little endian INT numbers. - */ - datatype = H5Tcopy(H5T_NATIVE_INT); - if (datatype < 0) { - printf ("H5Tcopy failed. \n"); - return -1; - } - - status = H5Tset_order(datatype, H5T_ORDER_LE); - if (status < 0) { - printf ("H5Tset_order failed. \n"); - return -1; - } - /* - * Create a new dataset within the file using defined dataspace and - * datatype and default dataset creation properties. - */ - dataset = H5Dcreate(fid, DATASETNAME, datatype, dataspace, - H5P_DEFAULT); - if (dataset < 0) { - printf ("H5Dcreate failed. \n"); - return -1; - } - - - /* - * Write the data to the dataset using default transfer properties. - */ - status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, data); - if (status < 0) { - printf ("H5Dwrite failed. \n"); - return -1; - } - - H5Sclose(dataspace); - H5Tclose(datatype); - H5Dclose(dataset); - H5Fclose(fid); - H5Pclose(fapl); - - printf("Test finished!\n"); - return 0; -} - -#endif diff --git a/testpar/Dependencies b/testpar/Dependencies index 379c7c8..1dff293 100644 --- a/testpar/Dependencies +++ b/testpar/Dependencies @@ -43,14 +43,12 @@ t_mpi.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -82,14 +80,12 @@ testphdf5.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -121,14 +117,12 @@ t_dset.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -160,14 +154,12 @@ t_file.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -199,14 +191,12 @@ t_mdset.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -238,14 +228,12 @@ t_ph5basic.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -277,14 +265,12 @@ t_coll_chunk.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -332,14 +318,12 @@ t_span_tree.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -375,14 +359,12 @@ t_chunk_alloc.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -414,14 +396,12 @@ t_filter_read.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h diff --git a/tools/h5diff/Dependencies b/tools/h5diff/Dependencies index e07689b..763ab40 100644 --- a/tools/h5diff/Dependencies +++ b/tools/h5diff/Dependencies @@ -42,16 +42,15 @@ h5diff_main.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/tools/lib/h5trav.h + $(top_srcdir)/tools/lib/h5trav.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h h5diffgentest.lo: \ $(srcdir)/h5diffgentest.c \ $(top_srcdir)/src/hdf5.h \ @@ -78,14 +77,12 @@ h5diffgentest.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h diff --git a/tools/h5dump/Dependencies b/tools/h5dump/Dependencies index 404c09a..65d56b0 100644 --- a/tools/h5dump/Dependencies +++ b/tools/h5dump/Dependencies @@ -42,14 +42,12 @@ h5dump.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -84,14 +82,12 @@ h5dumpgentest.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index be3e0ae..eaca6f8 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -2691,8 +2691,6 @@ dump_fcpl(hid_t fid) HDstrcpy(dname,"H5FD_CORE"); else if (H5FD_FAMILY==fdriver) HDstrcpy(dname,"H5FD_FAMILY"); - else if (H5FD_GASS==fdriver) - HDstrcpy(dname,"H5FD_GASS"); else if (H5FD_LOG==fdriver) HDstrcpy(dname,"H5FD_LOG"); else if (H5FD_MPIO==fdriver) diff --git a/tools/h5import/Dependencies b/tools/h5import/Dependencies index c084129..a827deb 100644 --- a/tools/h5import/Dependencies +++ b/tools/h5import/Dependencies @@ -41,18 +41,18 @@ h5import.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ - $(srcdir)/h5import.h + $(srcdir)/h5import.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h \ + $(top_srcdir)/src/hdf5.h h5importtest.lo: \ $(srcdir)/h5importtest.c \ $(top_srcdir)/src/H5private.h \ diff --git a/tools/h5jam/Dependencies b/tools/h5jam/Dependencies index 0cc4a71..14b97a5 100644 --- a/tools/h5jam/Dependencies +++ b/tools/h5jam/Dependencies @@ -41,14 +41,12 @@ h5jam.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -80,14 +78,12 @@ h5unjam.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ diff --git a/tools/h5ls/Dependencies b/tools/h5ls/Dependencies index 05ee20b..cfe1a3f 100644 --- a/tools/h5ls/Dependencies +++ b/tools/h5ls/Dependencies @@ -44,13 +44,11 @@ h5ls.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5tools_utils.h diff --git a/tools/h5repack/Dependencies b/tools/h5repack/Dependencies index 167e326..2506b83 100644 --- a/tools/h5repack/Dependencies +++ b/tools/h5repack/Dependencies @@ -17,11 +17,13 @@ h5repack.lo: \ $(srcdir)/h5repack.c \ - $(srcdir)/h5repack.h \ - $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5public.h \ $(top_builddir)/src/H5pubconf.h \ $(top_srcdir)/src/H5api_adpt.h \ + $(top_srcdir)/src/H5MPprivate.h \ + $(srcdir)/h5repack.h \ + $(top_srcdir)/src/hdf5.h \ $(top_srcdir)/src/H5Apublic.h \ $(top_srcdir)/src/H5Ipublic.h \ $(top_srcdir)/src/H5ACpublic.h \ @@ -42,19 +44,15 @@ h5repack.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/tools/lib/h5diff.h \ - $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/tools/lib/h5tools.h \ $(top_srcdir)/tools/lib/h5tools_utils.h h5repack_copy.lo: \ @@ -84,14 +82,12 @@ h5repack_copy.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ @@ -126,19 +122,19 @@ h5repack_refs.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ + $(top_srcdir)/tools/lib/h5diff.h \ + $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/tools/lib/h5tools.h h5repack_filters.lo: \ $(srcdir)/h5repack_filters.c \ @@ -167,14 +163,12 @@ h5repack_filters.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ @@ -182,48 +176,6 @@ h5repack_filters.lo: \ $(top_srcdir)/src/hdf5.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h -h5repack_list.lo: \ - $(srcdir)/h5repack_list.c \ - $(srcdir)/h5repack.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5public.h \ - $(top_builddir)/src/H5pubconf.h \ - $(top_srcdir)/src/H5api_adpt.h \ - $(top_srcdir)/src/H5Apublic.h \ - $(top_srcdir)/src/H5Ipublic.h \ - $(top_srcdir)/src/H5ACpublic.h \ - $(top_srcdir)/src/H5Bpublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5Epublic.h \ - $(top_srcdir)/src/H5Fpublic.h \ - $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5Opublic.h \ - $(top_srcdir)/src/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ - $(top_srcdir)/src/H5Rpublic.h \ - $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5FDcore.h \ - $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5FDmpi.h \ - $(top_srcdir)/src/H5FDmpio.h \ - $(top_srcdir)/src/H5FDmpiposix.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/tools/lib/h5trav.h \ - $(top_srcdir)/src/hdf5.h \ - $(top_srcdir)/src/H5private.h \ - $(top_srcdir)/src/H5MPprivate.h \ - $(top_srcdir)/tools/lib/h5tools.h \ - $(top_srcdir)/tools/lib/h5tools_utils.h h5repack_main.lo: \ $(srcdir)/h5repack_main.c \ $(top_srcdir)/tools/lib/h5tools_utils.h \ @@ -251,18 +203,16 @@ h5repack_main.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/tools/lib/h5trav.h \ $(srcdir)/h5repack.h \ - $(top_srcdir)/src/hdf5.h + $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/tools/lib/h5trav.h h5repack_opttable.lo: \ $(srcdir)/h5repack_opttable.c \ $(srcdir)/h5repack.h \ @@ -290,14 +240,12 @@ h5repack_opttable.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ @@ -329,14 +277,12 @@ h5repack_parse.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ @@ -368,14 +314,12 @@ h5repack_verify.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ @@ -383,7 +327,6 @@ h5repack_verify.lo: \ $(top_srcdir)/src/hdf5.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ - $(top_srcdir)/tools/lib/h5tools.h \ $(top_srcdir)/tools/lib/h5tools_utils.h h5repacktst.lo: \ $(srcdir)/h5repacktst.c \ @@ -412,14 +355,12 @@ h5repacktst.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/tools/lib/h5trav.h \ $(top_srcdir)/src/hdf5.h \ @@ -427,6 +368,6 @@ h5repacktst.lo: \ $(top_srcdir)/src/hdf5.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ - $(top_srcdir)/tools/lib/h5tools.h \ $(top_srcdir)/tools/lib/h5diff.h \ - $(top_srcdir)/tools/lib/h5trav.h + $(top_srcdir)/tools/lib/h5trav.h \ + $(top_srcdir)/tools/lib/h5tools.h diff --git a/tools/lib/Dependencies b/tools/lib/Dependencies index 1718cfa..61a2834 100644 --- a/tools/lib/Dependencies +++ b/tools/lib/Dependencies @@ -42,14 +42,12 @@ h5tools.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5tools_ref.h \ $(srcdir)/h5tools_str.h \ @@ -85,14 +83,12 @@ h5tools_str.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5tools_ref.h \ $(srcdir)/h5tools_str.h @@ -123,14 +119,12 @@ h5tools_utils.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -161,14 +155,12 @@ h5diff.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5trav.h \ $(top_srcdir)/src/H5private.h \ @@ -200,14 +192,12 @@ h5diff_array.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5trav.h \ $(top_srcdir)/src/H5private.h \ @@ -239,14 +229,12 @@ h5diff_attr.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5diff.h \ $(srcdir)/h5trav.h \ @@ -279,14 +267,12 @@ h5diff_dset.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5trav.h \ $(top_srcdir)/src/H5private.h \ @@ -319,14 +305,12 @@ h5diff_util.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5trav.h \ $(top_srcdir)/src/H5private.h \ @@ -358,14 +342,12 @@ h5trav.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h @@ -395,14 +377,12 @@ h5tools_filters.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(srcdir)/h5tools.h h5tools_ref.lo: \ @@ -432,14 +412,12 @@ h5tools_ref.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ @@ -474,14 +452,12 @@ h5tools_type.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h talign.lo: \ $(srcdir)/talign.c \ @@ -509,14 +485,12 @@ talign.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h \ diff --git a/tools/misc/Dependencies b/tools/misc/Dependencies index 51ee40a..ca0a901 100644 --- a/tools/misc/Dependencies +++ b/tools/misc/Dependencies @@ -96,14 +96,12 @@ h5repart.lo: \ $(top_srcdir)/src/H5Tpublic.h \ $(top_srcdir)/src/H5FDcore.h \ $(top_srcdir)/src/H5FDfamily.h \ - $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDlog.h \ $(top_srcdir)/src/H5FDmpi.h \ $(top_srcdir)/src/H5FDmpio.h \ $(top_srcdir)/src/H5FDmpiposix.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5private.h \ $(top_srcdir)/src/H5MPprivate.h |