diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2001-12-31 04:58:53 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2001-12-31 04:58:53 (GMT) |
| commit | 54121674c3d01dfb80af20d96a3aba909b33e803 (patch) | |
| tree | a81134a750d58d970353cf21daecde1d11d5d209 | |
| parent | b86f8fd78c603eb2fb9c5a20791241fb8a1bd43d (diff) | |
| download | hdf5-54121674c3d01dfb80af20d96a3aba909b33e803.zip hdf5-54121674c3d01dfb80af20d96a3aba909b33e803.tar.gz hdf5-54121674c3d01dfb80af20d96a3aba909b33e803.tar.bz2 | |
[svn-r4761] Purpose:
Removing the DPSS (gridstorage) driver source code.
(same as the v1.5)
Description:
The DPSS (using Grid-Storage) driver is retired.
Removed the configure option with-gridstorage from configure.in.
Cvs remove the following files
./src/H5FDdpss.c
./src/H5FDdpss.h
./test/dpss_read.c
./test/dpss_write.c
Regenerated Dependencies files (some had to be hand-edited since
'make depend' did not cover them.)
Removed reference to DPSS Virtual file driver from H5F.c.
Platforms tested:
modi4 (Parallel; -with-gass=...)
eirene (pthread safe)
arabica (fortran, cxx).
| -rw-r--r-- | MANIFEST | 4 | ||||
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rwxr-xr-x | configure | 1499 | ||||
| -rw-r--r-- | configure.in | 69 | ||||
| -rw-r--r-- | examples/Dependencies | 45 | ||||
| -rw-r--r-- | fortran/src/Dependencies | 13 | ||||
| -rw-r--r-- | pablo/Makefile.in | 2 | ||||
| -rw-r--r-- | perform/Dependencies | 71 | ||||
| -rw-r--r-- | src/Dependencies | 43 | ||||
| -rw-r--r-- | src/H5F.c | 4 | ||||
| -rw-r--r-- | src/H5FDdpss.c | 663 | ||||
| -rw-r--r-- | src/H5FDdpss.h | 39 | ||||
| -rw-r--r-- | src/H5P.c | 1 | ||||
| -rw-r--r-- | src/H5config.h.in | 12 | ||||
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/hdf5.h | 1 | ||||
| -rw-r--r-- | test/Dependencies | 180 | ||||
| -rw-r--r-- | test/Makefile.in | 14 | ||||
| -rw-r--r-- | test/dpss_read.c | 187 | ||||
| -rw-r--r-- | test/dpss_write.c | 149 | ||||
| -rw-r--r-- | tools/gifconv/Dependencies | 8 | ||||
| -rw-r--r-- | tools/h4toh5/Dependencies | 8 | ||||
| -rw-r--r-- | tools/h5dump/Dependencies | 2 | ||||
| -rw-r--r-- | tools/h5ls/Dependencies | 4 | ||||
| -rw-r--r-- | tools/h5toh4/Dependencies | 1 | ||||
| -rw-r--r-- | tools/lib/Dependencies | 4 | ||||
| -rw-r--r-- | tools/misc/Dependencies | 3 |
27 files changed, 666 insertions, 2367 deletions
@@ -796,8 +796,6 @@ ./src/H5FD.c ./src/H5FDcore.c ./src/H5FDcore.h -./src/H5FDdpss.c -./src/H5FDdpss.h ./src/H5FDfamily.c ./src/H5FDfamily.h ./src/H5FDgass.c @@ -903,8 +901,6 @@ ./test/big.c ./test/bittests.c ./test/cmpd_dset.c -./test/dpss_read.c -./test/dpss_write.c ./test/dsets.c ./test/dtypes.c ./test/enum.c @@ -52,9 +52,6 @@ /* Define if the SRB is defined */ #undef HAVE_SRB -/* Define if the Grid Storage is defined */ -#undef HAVE_GRIDSTORAGE - /* Define if the stream virtual file driver should be compiled */ #undef HAVE_STREAM @@ -160,8 +160,6 @@ ac_help="$ac_help ac_help="$ac_help --with-srb[=DIR] Use the SRB Library [default=no]" ac_help="$ac_help - --with-gridstorage[=DIR] Use the Globus Grid Storage driver [default=no]" -ac_help="$ac_help --with-pthread[=DIR] Use the Pthreads library [default=no]" ac_help="$ac_help --enable-threadsafe Enable thread safe capability" @@ -717,7 +715,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:721: checking host system type" >&5 +echo "configure:719: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -740,12 +738,12 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking shell variables initial values""... $ac_c" 1>&6 -echo "configure:744: checking shell variables initial values" >&5 +echo "configure:742: checking shell variables initial values" >&5 set >&5 echo "$ac_t""done" 1>&6 echo $ac_n "checking for cached host""... $ac_c" 1>&6 -echo "configure:749: checking for cached host" >&5 +echo "configure:747: checking for cached host" >&5 if eval "test \"`echo '$''{'hdf5_cv_host'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -793,7 +791,7 @@ fi echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6 -echo "configure:797: checking for sizeof hsize_t and hssize_t" >&5 +echo "configure:795: checking for sizeof hsize_t and hssize_t" >&5 case $HSIZET in @@ -824,7 +822,7 @@ for f in $host_cpu-$host_vendor-$host_os \ $host_vendor \ $host_cpu ; do echo $ac_n "checking for config $f""... $ac_c" 1>&6 -echo "configure:828: checking for config $f" >&5 +echo "configure:826: checking for config $f" >&5 if test -f "$srcdir/config/$f"; then host_config=$srcdir/config/$f echo "$ac_t""found" 1>&6 @@ -841,7 +839,7 @@ hname="`hostname`" while test -n "$hname"; do file=$srcdir/config/site-specific/host-$hname echo $ac_n "checking for config $file""... $ac_c" 1>&6 -echo "configure:845: checking for config $file" >&5 +echo "configure:843: checking for config $file" >&5 if test -f "$file"; then . $file echo "$ac_t""found" 1>&6 @@ -856,7 +854,7 @@ done # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:860: checking for $ac_word" >&5 +echo "configure:858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -886,7 +884,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:890: checking for $ac_word" >&5 +echo "configure:888: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -937,7 +935,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:941: checking for $ac_word" >&5 +echo "configure:939: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -969,7 +967,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:973: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:971: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -980,12 +978,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 984 "configure" +#line 982 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1011,12 +1009,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1015: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1013: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1020: checking whether we are using GNU C" >&5 +echo "configure:1018: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1025,7 +1023,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1044,7 +1042,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1048: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1046: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1080,7 +1078,7 @@ CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`" config_dirs="" echo $ac_n "checking if fortran interface enabled""... $ac_c" 1>&6 -echo "configure:1084: checking if fortran interface enabled" >&5 +echo "configure:1082: checking if fortran interface enabled" >&5 # Check whether --enable-fortran or --disable-fortran was given. if test "${enable_fortran+set}" = set; then enableval="$enable_fortran" @@ -1100,7 +1098,7 @@ else fi echo $ac_n "checking if c++ interface enabled""... $ac_c" 1>&6 -echo "configure:1104: checking if c++ interface enabled" >&5 +echo "configure:1102: checking if c++ interface enabled" >&5 # Check whether --enable-cxx or --disable-cxx was given. if test "${enable_cxx+set}" = set; then enableval="$enable_cxx" @@ -1123,7 +1121,7 @@ subdirs="${config_dirs}" echo $ac_n "checking if should build only statically linked executables""... $ac_c" 1>&6 -echo "configure:1127: checking if should build only statically linked executables" >&5 +echo "configure:1125: checking if should build only statically linked executables" >&5 # Check whether --enable-static_exec or --disable-static_exec was given. if test "${enable_static_exec+set}" = set; then enableval="$enable_static_exec" @@ -1147,7 +1145,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1151: checking for $ac_word" >&5 +echo "configure:1149: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1184,7 +1182,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1188: checking for $ac_word" >&5 +echo "configure:1186: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1220,7 +1218,7 @@ fi export AR echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1224: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1222: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1258,7 +1256,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1262: checking for a BSD compatible install" >&5 +echo "configure:1260: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1381,7 +1379,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1385: checking build system type" >&5 +echo "configure:1383: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1401,7 +1399,7 @@ echo "$ac_t""$build" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1405: checking for $ac_word" >&5 +echo "configure:1403: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1440,7 +1438,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1444: checking for ld used by GCC" >&5 +echo "configure:1442: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1464,10 +1462,10 @@ echo "configure:1444: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1468: checking for GNU ld" >&5 +echo "configure:1466: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1471: checking for non-GNU ld" >&5 +echo "configure:1469: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1502,7 +1500,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1506: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1504: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1518,7 +1516,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1522: checking for BSD-compatible nm" >&5 +echo "configure:1520: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1554,7 +1552,7 @@ NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1558: checking whether ln -s works" >&5 +echo "configure:1556: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1603,8 +1601,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1607 "configure"' > conftest.$ac_ext - if { (eval echo configure:1608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1605 "configure"' > conftest.$ac_ext + if { (eval echo configure:1606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1625,19 +1623,19 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1629: checking whether the C compiler needs -belf" >&5 +echo "configure:1627: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1634 "configure" +#line 1632 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1746,7 +1744,7 @@ case "$INSTALL" in esac echo $ac_n "checking make""... $ac_c" 1>&6 -echo "configure:1750: checking make" >&5 +echo "configure:1748: checking make" >&5 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ sed -n 1p|cut -c1-8`" = "GNU Make"; then @@ -1763,7 +1761,7 @@ fi if test -z "$DEPEND"; then echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6 -echo "configure:1767: checking how to include a makefile" >&5 +echo "configure:1765: checking how to include a makefile" >&5 cat >makeinc <<EOF foo: @@ -1793,7 +1791,7 @@ EOF fi echo $ac_n "checking how make searches directories""... $ac_c" 1>&6 -echo "configure:1797: checking how make searches directories" >&5 +echo "configure:1795: checking how make searches directories" >&5 while true; do #for break # The most common method is `VPATH=DIR1 DIR2 ...' cat >maketest <<EOF @@ -1858,7 +1856,7 @@ done rm maketest echo $ac_n "checking for production mode""... $ac_c" 1>&6 -echo "configure:1862: checking for production mode" >&5 +echo "configure:1860: checking for production mode" >&5 # Check whether --enable-production or --disable-production was given. if test "${enable_production+set}" = set; then enableval="$enable_production" @@ -1892,7 +1890,7 @@ case "X-$enable_production" in esac echo $ac_n "checking for ceil in -lm""... $ac_c" 1>&6 -echo "configure:1896: checking for ceil in -lm" >&5 +echo "configure:1894: checking for ceil in -lm" >&5 ac_lib_var=`echo m'_'ceil | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1900,7 +1898,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1904 "configure" +#line 1902 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1911,7 +1909,7 @@ int main() { ceil() ; return 0; } EOF -if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1941,7 +1939,7 @@ fi if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then echo $ac_n "checking for xdr_int in -lnsl""... $ac_c" 1>&6 -echo "configure:1945: checking for xdr_int in -lnsl" >&5 +echo "configure:1943: checking for xdr_int in -lnsl" >&5 ac_lib_var=`echo nsl'_'xdr_int | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1949,7 +1947,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1953 "configure" +#line 1951 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1960,7 +1958,7 @@ int main() { xdr_int() ; return 0; } EOF -if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1991,7 +1989,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1995: checking how to run the C preprocessor" >&5 +echo "configure:1993: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2006,13 +2004,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2010 "configure" +#line 2008 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2023,13 +2021,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2027 "configure" +#line 2025 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2040,13 +2038,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2044 "configure" +#line 2042 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2071,12 +2069,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2075: checking for ANSI C header files" >&5 +echo "configure:2073: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2080 "configure" +#line 2078 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2084,7 +2082,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2101,7 +2099,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2105 "configure" +#line 2103 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2119,7 +2117,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2123 "configure" +#line 2121 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2140,7 +2138,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2144 "configure" +#line 2142 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2151,7 +2149,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2175,12 +2173,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2179: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2177: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2184 "configure" +#line 2182 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2189,7 +2187,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2213,17 +2211,17 @@ for ac_hdr in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2217: checking for $ac_hdr" >&5 +echo "configure:2215: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2222 "configure" +#line 2220 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2253,17 +2251,17 @@ for ac_hdr in sys/socket.h sys/types.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2257: checking for $ac_hdr" >&5 +echo "configure:2255: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2262 "configure" +#line 2260 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2293,17 +2291,17 @@ for ac_hdr in stddef.h setjmp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2297: checking for $ac_hdr" >&5 +echo "configure:2295: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2302 "configure" +#line 2300 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2333,17 +2331,17 @@ for ac_hdr in stdint.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2337: checking for $ac_hdr" >&5 +echo "configure:2335: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2342 "configure" +#line 2340 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2373,17 +2371,17 @@ for ac_hdr in io.h winsock.h sys/timeb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2377: checking for $ac_hdr" >&5 +echo "configure:2375: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2382 "configure" +#line 2380 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2416,17 +2414,17 @@ case "$host" in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2420: checking for $ac_hdr" >&5 +echo "configure:2418: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2425 "configure" +#line 2423 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2475,12 +2473,12 @@ fi for ac_func in getdents64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2479: checking for $ac_func" >&5 +echo "configure:2477: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2484 "configure" +#line 2482 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2503,7 +2501,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2531,7 +2529,7 @@ done esac echo $ac_n "checking for large file support on linux mode""... $ac_c" 1>&6 -echo "configure:2535: checking for large file support on linux mode" >&5 +echo "configure:2533: checking for large file support on linux mode" >&5 if test "X$LINUX_LFS" = "Xyes"; then echo "$ac_t""enabled" 1>&6 @@ -2547,24 +2545,24 @@ echo "configure:2535: checking for large file support on linux mode" >&5 esac cat > conftest.$ac_ext <<EOF -#line 2551 "configure" +#line 2549 "configure" #include "confdefs.h" #include <sys/types.h> int main() { off64_t n = 0; ; return 0; } EOF -if { (eval echo configure:2558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* for ac_func in lseek64 fseek64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2563: checking for $ac_func" >&5 +echo "configure:2561: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2568 "configure" +#line 2566 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2587,7 +2585,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2620,12 +2618,12 @@ fi rm -f conftest* echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2624: checking for off_t" >&5 +echo "configure:2622: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2629 "configure" +#line 2627 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2653,12 +2651,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2657: checking for size_t" >&5 +echo "configure:2655: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2662 "configure" +#line 2660 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2686,12 +2684,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:2690: checking for ssize_t" >&5 +echo "configure:2688: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2695 "configure" +#line 2693 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2719,14 +2717,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2723: checking whether byte ordering is bigendian" >&5 +echo "configure:2721: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2730 "configure" +#line 2728 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2737,11 +2735,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2745 "configure" +#line 2743 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2752,7 +2750,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2772,7 +2770,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2776 "configure" +#line 2774 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2785,7 +2783,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2809,7 +2807,7 @@ EOF fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:2813: checking size of char" >&5 +echo "configure:2811: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2817,7 +2815,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext <<EOF -#line 2821 "configure" +#line 2819 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2828,7 +2826,7 @@ main() exit(0); } EOF -if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -2848,7 +2846,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2852: checking size of short" >&5 +echo "configure:2850: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2856,7 +2854,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext <<EOF -#line 2860 "configure" +#line 2858 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2867,7 +2865,7 @@ main() exit(0); } EOF -if { (eval echo configure:2871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2887,7 +2885,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2891: checking size of int" >&5 +echo "configure:2889: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2895,7 +2893,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 2899 "configure" +#line 2897 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2906,7 +2904,7 @@ main() exit(0); } EOF -if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2926,7 +2924,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2930: checking size of long" >&5 +echo "configure:2928: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2934,7 +2932,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext <<EOF -#line 2938 "configure" +#line 2936 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2945,7 +2943,7 @@ main() exit(0); } EOF -if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2965,7 +2963,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2969: checking size of long long" >&5 +echo "configure:2967: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2973,7 +2971,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext <<EOF -#line 2977 "configure" +#line 2975 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2984,7 +2982,7 @@ main() exit(0); } EOF -if { (eval echo configure:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -3004,7 +3002,7 @@ EOF echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:3008: checking size of __int64" >&5 +echo "configure:3006: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3012,7 +3010,7 @@ else ac_cv_sizeof___int64=8 else cat > conftest.$ac_ext <<EOF -#line 3016 "configure" +#line 3014 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3023,7 +3021,7 @@ main() exit(0); } EOF -if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -3043,7 +3041,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:3047: checking size of float" >&5 +echo "configure:3045: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3051,7 +3049,7 @@ else ac_cv_sizeof_float=4 else cat > conftest.$ac_ext <<EOF -#line 3055 "configure" +#line 3053 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3062,7 +3060,7 @@ main() exit(0); } EOF -if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -3082,7 +3080,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:3086: checking size of double" >&5 +echo "configure:3084: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3090,7 +3088,7 @@ else ac_cv_sizeof_double=8 else cat > conftest.$ac_ext <<EOF -#line 3094 "configure" +#line 3092 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3101,7 +3099,7 @@ main() exit(0); } EOF -if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -3121,7 +3119,7 @@ EOF echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:3125: checking size of long double" >&5 +echo "configure:3123: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3129,7 +3127,7 @@ else ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext <<EOF -#line 3133 "configure" +#line 3131 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3140,7 +3138,7 @@ main() exit(0); } EOF -if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -3219,7 +3217,7 @@ EOF fi echo $ac_n "checking size of int8_t""... $ac_c" 1>&6 -echo "configure:3223: checking size of int8_t" >&5 +echo "configure:3221: checking size of int8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3227,7 +3225,7 @@ else ac_cv_sizeof_int8_t=1 else cat > conftest.$ac_ext <<EOF -#line 3231 "configure" +#line 3229 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3238,7 +3236,7 @@ main() exit(0); } EOF -if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int8_t=`cat conftestval` else @@ -3258,7 +3256,7 @@ EOF echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6 -echo "configure:3262: checking size of uint8_t" >&5 +echo "configure:3260: checking size of uint8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3266,7 +3264,7 @@ else ac_cv_sizeof_uint8_t=1 else cat > conftest.$ac_ext <<EOF -#line 3270 "configure" +#line 3268 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3277,7 +3275,7 @@ main() exit(0); } EOF -if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint8_t=`cat conftestval` else @@ -3297,7 +3295,7 @@ EOF echo $ac_n "checking size of int_least8_t""... $ac_c" 1>&6 -echo "configure:3301: checking size of int_least8_t" >&5 +echo "configure:3299: checking size of int_least8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3305,7 +3303,7 @@ else ac_cv_sizeof_int_least8_t=1 else cat > conftest.$ac_ext <<EOF -#line 3309 "configure" +#line 3307 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3316,7 +3314,7 @@ main() exit(0); } EOF -if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least8_t=`cat conftestval` else @@ -3336,7 +3334,7 @@ EOF echo $ac_n "checking size of uint_least8_t""... $ac_c" 1>&6 -echo "configure:3340: checking size of uint_least8_t" >&5 +echo "configure:3338: checking size of uint_least8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3344,7 +3342,7 @@ else ac_cv_sizeof_uint_least8_t=1 else cat > conftest.$ac_ext <<EOF -#line 3348 "configure" +#line 3346 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3355,7 +3353,7 @@ main() exit(0); } EOF -if { (eval echo configure:3359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least8_t=`cat conftestval` else @@ -3375,7 +3373,7 @@ EOF echo $ac_n "checking size of int_fast8_t""... $ac_c" 1>&6 -echo "configure:3379: checking size of int_fast8_t" >&5 +echo "configure:3377: checking size of int_fast8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3383,7 +3381,7 @@ else ac_cv_sizeof_int_fast8_t=1 else cat > conftest.$ac_ext <<EOF -#line 3387 "configure" +#line 3385 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3394,7 +3392,7 @@ main() exit(0); } EOF -if { (eval echo configure:3398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast8_t=`cat conftestval` else @@ -3414,7 +3412,7 @@ EOF echo $ac_n "checking size of uint_fast8_t""... $ac_c" 1>&6 -echo "configure:3418: checking size of uint_fast8_t" >&5 +echo "configure:3416: checking size of uint_fast8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3422,7 +3420,7 @@ else ac_cv_sizeof_uint_fast8_t=1 else cat > conftest.$ac_ext <<EOF -#line 3426 "configure" +#line 3424 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3433,7 +3431,7 @@ main() exit(0); } EOF -if { (eval echo configure:3437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast8_t=`cat conftestval` else @@ -3454,7 +3452,7 @@ EOF echo $ac_n "checking size of int16_t""... $ac_c" 1>&6 -echo "configure:3458: checking size of int16_t" >&5 +echo "configure:3456: checking size of int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3462,7 +3460,7 @@ else ac_cv_sizeof_int16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3466 "configure" +#line 3464 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3473,7 +3471,7 @@ main() exit(0); } EOF -if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int16_t=`cat conftestval` else @@ -3493,7 +3491,7 @@ EOF echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:3497: checking size of uint16_t" >&5 +echo "configure:3495: checking size of uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3501,7 +3499,7 @@ else ac_cv_sizeof_uint16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3505 "configure" +#line 3503 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3512,7 +3510,7 @@ main() exit(0); } EOF -if { (eval echo configure:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -3532,7 +3530,7 @@ EOF echo $ac_n "checking size of int_least16_t""... $ac_c" 1>&6 -echo "configure:3536: checking size of int_least16_t" >&5 +echo "configure:3534: checking size of int_least16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3540,7 +3538,7 @@ else ac_cv_sizeof_int_least16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3544 "configure" +#line 3542 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3551,7 +3549,7 @@ main() exit(0); } EOF -if { (eval echo configure:3555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least16_t=`cat conftestval` else @@ -3571,7 +3569,7 @@ EOF echo $ac_n "checking size of uint_least16_t""... $ac_c" 1>&6 -echo "configure:3575: checking size of uint_least16_t" >&5 +echo "configure:3573: checking size of uint_least16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3579,7 +3577,7 @@ else ac_cv_sizeof_uint_least16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3583 "configure" +#line 3581 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3590,7 +3588,7 @@ main() exit(0); } EOF -if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least16_t=`cat conftestval` else @@ -3610,7 +3608,7 @@ EOF echo $ac_n "checking size of int_fast16_t""... $ac_c" 1>&6 -echo "configure:3614: checking size of int_fast16_t" >&5 +echo "configure:3612: checking size of int_fast16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3618,7 +3616,7 @@ else ac_cv_sizeof_int_fast16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3622 "configure" +#line 3620 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3629,7 +3627,7 @@ main() exit(0); } EOF -if { (eval echo configure:3633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast16_t=`cat conftestval` else @@ -3649,7 +3647,7 @@ EOF echo $ac_n "checking size of uint_fast16_t""... $ac_c" 1>&6 -echo "configure:3653: checking size of uint_fast16_t" >&5 +echo "configure:3651: checking size of uint_fast16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3657,7 +3655,7 @@ else ac_cv_sizeof_uint_fast16_t=2 else cat > conftest.$ac_ext <<EOF -#line 3661 "configure" +#line 3659 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3668,7 +3666,7 @@ main() exit(0); } EOF -if { (eval echo configure:3672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast16_t=`cat conftestval` else @@ -3689,7 +3687,7 @@ EOF echo $ac_n "checking size of int32_t""... $ac_c" 1>&6 -echo "configure:3693: checking size of int32_t" >&5 +echo "configure:3691: checking size of int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3697,7 +3695,7 @@ else ac_cv_sizeof_int32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3701 "configure" +#line 3699 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3708,7 +3706,7 @@ main() exit(0); } EOF -if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int32_t=`cat conftestval` else @@ -3728,7 +3726,7 @@ EOF echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:3732: checking size of uint32_t" >&5 +echo "configure:3730: checking size of uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3736,7 +3734,7 @@ else ac_cv_sizeof_uint32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3740 "configure" +#line 3738 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3747,7 +3745,7 @@ main() exit(0); } EOF -if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -3767,7 +3765,7 @@ EOF echo $ac_n "checking size of int_least32_t""... $ac_c" 1>&6 -echo "configure:3771: checking size of int_least32_t" >&5 +echo "configure:3769: checking size of int_least32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3775,7 +3773,7 @@ else ac_cv_sizeof_int_least32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3779 "configure" +#line 3777 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3786,7 +3784,7 @@ main() exit(0); } EOF -if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least32_t=`cat conftestval` else @@ -3806,7 +3804,7 @@ EOF echo $ac_n "checking size of uint_least32_t""... $ac_c" 1>&6 -echo "configure:3810: checking size of uint_least32_t" >&5 +echo "configure:3808: checking size of uint_least32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3814,7 +3812,7 @@ else ac_cv_sizeof_uint_least32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3818 "configure" +#line 3816 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3825,7 +3823,7 @@ main() exit(0); } EOF -if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least32_t=`cat conftestval` else @@ -3845,7 +3843,7 @@ EOF echo $ac_n "checking size of int_fast32_t""... $ac_c" 1>&6 -echo "configure:3849: checking size of int_fast32_t" >&5 +echo "configure:3847: checking size of int_fast32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3853,7 +3851,7 @@ else ac_cv_sizeof_int_fast32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3857 "configure" +#line 3855 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3864,7 +3862,7 @@ main() exit(0); } EOF -if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast32_t=`cat conftestval` else @@ -3884,7 +3882,7 @@ EOF echo $ac_n "checking size of uint_fast32_t""... $ac_c" 1>&6 -echo "configure:3888: checking size of uint_fast32_t" >&5 +echo "configure:3886: checking size of uint_fast32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3892,7 +3890,7 @@ else ac_cv_sizeof_uint_fast32_t=4 else cat > conftest.$ac_ext <<EOF -#line 3896 "configure" +#line 3894 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3903,7 +3901,7 @@ main() exit(0); } EOF -if { (eval echo configure:3907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast32_t=`cat conftestval` else @@ -3924,7 +3922,7 @@ EOF echo $ac_n "checking size of int64_t""... $ac_c" 1>&6 -echo "configure:3928: checking size of int64_t" >&5 +echo "configure:3926: checking size of int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3932,7 +3930,7 @@ else ac_cv_sizeof_int64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3936 "configure" +#line 3934 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3943,7 +3941,7 @@ main() exit(0); } EOF -if { (eval echo configure:3947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int64_t=`cat conftestval` else @@ -3963,7 +3961,7 @@ EOF echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:3967: checking size of uint64_t" >&5 +echo "configure:3965: checking size of uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3971,7 +3969,7 @@ else ac_cv_sizeof_uint64_t=8 else cat > conftest.$ac_ext <<EOF -#line 3975 "configure" +#line 3973 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3982,7 +3980,7 @@ main() exit(0); } EOF -if { (eval echo configure:3986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -4002,7 +4000,7 @@ EOF echo $ac_n "checking size of int_least64_t""... $ac_c" 1>&6 -echo "configure:4006: checking size of int_least64_t" >&5 +echo "configure:4004: checking size of int_least64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_least64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4010,7 +4008,7 @@ else ac_cv_sizeof_int_least64_t=8 else cat > conftest.$ac_ext <<EOF -#line 4014 "configure" +#line 4012 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4021,7 +4019,7 @@ main() exit(0); } EOF -if { (eval echo configure:4025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_least64_t=`cat conftestval` else @@ -4041,7 +4039,7 @@ EOF echo $ac_n "checking size of uint_least64_t""... $ac_c" 1>&6 -echo "configure:4045: checking size of uint_least64_t" >&5 +echo "configure:4043: checking size of uint_least64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4049,7 +4047,7 @@ else ac_cv_sizeof_uint_least64_t=8 else cat > conftest.$ac_ext <<EOF -#line 4053 "configure" +#line 4051 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4060,7 +4058,7 @@ main() exit(0); } EOF -if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_least64_t=`cat conftestval` else @@ -4080,7 +4078,7 @@ EOF echo $ac_n "checking size of int_fast64_t""... $ac_c" 1>&6 -echo "configure:4084: checking size of int_fast64_t" >&5 +echo "configure:4082: checking size of int_fast64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4088,7 +4086,7 @@ else ac_cv_sizeof_int_fast64_t=8 else cat > conftest.$ac_ext <<EOF -#line 4092 "configure" +#line 4090 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4099,7 +4097,7 @@ main() exit(0); } EOF -if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_fast64_t=`cat conftestval` else @@ -4119,7 +4117,7 @@ EOF echo $ac_n "checking size of uint_fast64_t""... $ac_c" 1>&6 -echo "configure:4123: checking size of uint_fast64_t" >&5 +echo "configure:4121: checking size of uint_fast64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4127,7 +4125,7 @@ else ac_cv_sizeof_uint_fast64_t=8 else cat > conftest.$ac_ext <<EOF -#line 4131 "configure" +#line 4129 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4138,7 +4136,7 @@ main() exit(0); } EOF -if { (eval echo configure:4142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint_fast64_t=`cat conftestval` else @@ -4159,7 +4157,7 @@ EOF echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:4163: checking size of size_t" >&5 +echo "configure:4161: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4167,7 +4165,7 @@ else ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext <<EOF -#line 4171 "configure" +#line 4169 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4178,7 +4176,7 @@ main() exit(0); } EOF -if { (eval echo configure:4182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -4198,7 +4196,7 @@ EOF echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6 -echo "configure:4202: checking size of ssize_t" >&5 +echo "configure:4200: checking size of ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4206,7 +4204,7 @@ else ac_cv_sizeof_ssize_t=4 else cat > conftest.$ac_ext <<EOF -#line 4210 "configure" +#line 4208 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4217,7 +4215,7 @@ main() exit(0); } EOF -if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_ssize_t=`cat conftestval` else @@ -4240,7 +4238,7 @@ cat >>confdefs.h <<\EOF #include <sys/types.h> /*for off_t definition*/ EOF echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:4244: checking size of off_t" >&5 +echo "configure:4242: checking size of off_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4248,7 +4246,7 @@ else ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext <<EOF -#line 4252 "configure" +#line 4250 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4259,7 +4257,7 @@ main() exit(0); } EOF -if { (eval echo configure:4263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -4357,7 +4355,7 @@ case "$withval" in yes) failed="no" echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:4361: checking for compress2 in -lz" >&5 +echo "configure:4359: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4365,7 +4363,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4369 "configure" +#line 4367 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4376,7 +4374,7 @@ int main() { compress2() ; return 0; } EOF -if { (eval echo configure:4380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4407,7 +4405,7 @@ fi if test "$failed" = "no"; then HAVE_ZLIB="yes" echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4411: checking for jpeg_start_compress in -ljpeg" >&5 +echo "configure:4409: checking for jpeg_start_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4415,7 +4413,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <<EOF -#line 4419 "configure" +#line 4417 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4426,7 +4424,7 @@ int main() { jpeg_start_compress() ; return 0; } EOF -if { (eval echo configure:4430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4457,7 +4455,7 @@ fi fi if test "$failed" = "no"; then echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 -echo "configure:4461: checking for Hstartaccess in -ldf" >&5 +echo "configure:4459: checking for Hstartaccess in -ldf" >&5 ac_lib_var=`echo df'_'Hstartaccess | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4465,7 +4463,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4469 "configure" +#line 4467 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4476,7 +4474,7 @@ int main() { Hstartaccess() ; return 0; } EOF -if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4507,7 +4505,7 @@ fi fi if test "$failed" = "no"; then echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 -echo "configure:4511: checking for SDstart in -lmfhdf" >&5 +echo "configure:4509: checking for SDstart in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'SDstart | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4515,7 +4513,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4519 "configure" +#line 4517 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4526,7 +4524,7 @@ int main() { SDstart() ; return 0; } EOF -if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4564,7 +4562,7 @@ fi ;; no) echo $ac_n "checking for HDF4""... $ac_c" 1>&6 -echo "configure:4568: checking for HDF4" >&5 +echo "configure:4566: checking for HDF4" >&5 echo "$ac_t""suppressed" 1>&6 unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5 ;; @@ -4593,17 +4591,17 @@ echo "configure:4568: checking for HDF4" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4597: checking for $ac_hdr" >&5 +echo "configure:4595: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4602 "configure" +#line 4600 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4637,7 +4635,7 @@ done if test "$failed" = "no"; then echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:4641: checking for compress2 in -lz" >&5 +echo "configure:4639: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4645,7 +4643,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4649 "configure" +#line 4647 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4656,7 +4654,7 @@ int main() { compress2() ; return 0; } EOF -if { (eval echo configure:4660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4687,7 +4685,7 @@ fi fi if test "$failed" = "no"; then echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4691: checking for jpeg_start_compress in -ljpeg" >&5 +echo "configure:4689: checking for jpeg_start_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4695,7 +4693,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <<EOF -#line 4699 "configure" +#line 4697 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4706,7 +4704,7 @@ int main() { jpeg_start_compress() ; return 0; } EOF -if { (eval echo configure:4710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4738,7 +4736,7 @@ fi fi if test "$failed" = "no"; then echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6 -echo "configure:4742: checking for Hstartaccess in -ldf" >&5 +echo "configure:4740: checking for Hstartaccess in -ldf" >&5 ac_lib_var=`echo df'_'Hstartaccess | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4746,7 +4744,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4750 "configure" +#line 4748 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4757,7 +4755,7 @@ int main() { Hstartaccess() ; return 0; } EOF -if { (eval echo configure:4761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4788,7 +4786,7 @@ fi fi if test "$failed" = "no"; then echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6 -echo "configure:4792: checking for SDstart in -lmfhdf" >&5 +echo "configure:4790: checking for SDstart in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'SDstart | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4796,7 +4794,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4800 "configure" +#line 4798 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4807,7 +4805,7 @@ int main() { SDstart() ; return 0; } EOF -if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4863,17 +4861,17 @@ case $withval in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4867: checking for $ac_hdr" >&5 +echo "configure:4865: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4872 "configure" +#line 4870 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4900,7 +4898,7 @@ fi done echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:4904: checking for compress2 in -lz" >&5 +echo "configure:4902: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4908,7 +4906,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4912 "configure" +#line 4910 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4919,7 +4917,7 @@ int main() { compress2() ; return 0; } EOF -if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4951,7 +4949,7 @@ fi no) HAVE_ZLIB="no" echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 -echo "configure:4955: checking for GNU zlib" >&5 +echo "configure:4953: checking for GNU zlib" >&5 echo "$ac_t""suppressed" 1>&6 ;; *) @@ -4980,17 +4978,17 @@ echo "configure:4955: checking for GNU zlib" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4984: checking for $ac_hdr" >&5 +echo "configure:4982: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4989 "configure" +#line 4987 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5023,7 +5021,7 @@ done fi echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:5027: checking for compress2 in -lz" >&5 +echo "configure:5025: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5031,7 +5029,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 5035 "configure" +#line 5033 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5042,7 +5040,7 @@ int main() { compress2() ; return 0; } EOF -if { (eval echo configure:5046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5086,7 +5084,7 @@ fi case "$withval" in yes) echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 -echo "configure:5090: checking for main in -lcrypto" >&5 +echo "configure:5088: checking for main in -lcrypto" >&5 ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5094,14 +5092,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 5098 "configure" +#line 5096 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5130,7 +5128,7 @@ unset SSL fi echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6 -echo "configure:5134: checking for SSL_get_version in -lssl" >&5 +echo "configure:5132: checking for SSL_get_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5138,7 +5136,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5142 "configure" +#line 5140 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5149,7 +5147,7 @@ int main() { SSL_get_version() ; return 0; } EOF -if { (eval echo configure:5153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5180,7 +5178,7 @@ fi ;; no) echo $ac_n "checking for SSL""... $ac_c" 1>&6 -echo "configure:5184: checking for SSL" >&5 +echo "configure:5182: checking for SSL" >&5 echo "$ac_t""suppressed" 1>&6 unset SSL ;; @@ -5188,7 +5186,7 @@ echo "configure:5184: checking for SSL" >&5 saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$with_ssl" echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 -echo "configure:5192: checking for main in -lcrypto" >&5 +echo "configure:5190: checking for main in -lcrypto" >&5 ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5196,14 +5194,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 5200 "configure" +#line 5198 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5232,7 +5230,7 @@ LDFLAGS="$saved_LDFLAGS"; unset SSL fi echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6 -echo "configure:5236: checking for SSL_get_version in -lssl" >&5 +echo "configure:5234: checking for SSL_get_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5240,7 +5238,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5244 "configure" +#line 5242 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5251,7 +5249,7 @@ int main() { SSL_get_version() ; return 0; } EOF -if { (eval echo configure:5255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5299,17 +5297,17 @@ case "$withval" in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5303: checking for $ac_hdr" >&5 +echo "configure:5301: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5308 "configure" +#line 5306 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5337,7 +5335,7 @@ fi done echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:5341: checking for globus_module_activate in -lglobus_common" >&5 +echo "configure:5339: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5345,7 +5343,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <<EOF -#line 5349 "configure" +#line 5347 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5356,7 +5354,7 @@ int main() { globus_module_activate() ; return 0; } EOF -if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5385,7 +5383,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:5389: checking for main in -lglobus_gass_cache" >&5 +echo "configure:5387: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5393,14 +5391,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <<EOF -#line 5397 "configure" +#line 5395 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5429,7 +5427,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:5433: checking for main in -lglobus_gaa" >&5 +echo "configure:5431: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5437,14 +5435,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <<EOF -#line 5441 "configure" +#line 5439 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5473,7 +5471,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:5477: checking for main in -lglobus_gss" >&5 +echo "configure:5475: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5481,14 +5479,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <<EOF -#line 5485 "configure" +#line 5483 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5517,7 +5515,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:5521: checking for main in -lglobus_gss_assist" >&5 +echo "configure:5519: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5525,14 +5523,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 5529 "configure" +#line 5527 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5561,7 +5559,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:5565: checking for main in -lglobus_io" >&5 +echo "configure:5563: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5569,14 +5567,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <<EOF -#line 5573 "configure" +#line 5571 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5605,7 +5603,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:5609: checking for main in -lglobus_gass_transfer_assist" >&5 +echo "configure:5607: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5613,14 +5611,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 5617 "configure" +#line 5615 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5649,7 +5647,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:5653: checking for main in -lglobus_gass_transfer" >&5 +echo "configure:5651: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5657,14 +5655,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <<EOF -#line 5661 "configure" +#line 5659 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5693,7 +5691,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:5697: checking for globus_gass_open in -lglobus_gass_file" >&5 +echo "configure:5695: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5701,7 +5699,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 5705 "configure" +#line 5703 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5712,7 +5710,7 @@ int main() { globus_gass_open() ; return 0; } EOF -if { (eval echo configure:5716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5744,7 +5742,7 @@ fi no) echo $ac_n "checking for GASS""... $ac_c" 1>&6 -echo "configure:5748: checking for GASS" >&5 +echo "configure:5746: checking for GASS" >&5 echo "$ac_t""suppressed" 1>&6 unset GASS TESTGASS ;; @@ -5770,17 +5768,17 @@ echo "configure:5748: checking for GASS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5774: checking for $ac_hdr" >&5 +echo "configure:5772: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5779 "configure" +#line 5777 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5813,17 +5811,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5817: checking for $ac_hdr" >&5 +echo "configure:5815: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5822 "configure" +#line 5820 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5855,7 +5853,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$gass_lib" echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:5859: checking for globus_module_activate in -lglobus_common" >&5 +echo "configure:5857: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5863,7 +5861,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <<EOF -#line 5867 "configure" +#line 5865 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5874,7 +5872,7 @@ int main() { globus_module_activate() ; return 0; } EOF -if { (eval echo configure:5878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5903,7 +5901,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:5907: checking for main in -lglobus_gass_cache" >&5 +echo "configure:5905: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5911,14 +5909,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <<EOF -#line 5915 "configure" +#line 5913 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5947,7 +5945,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:5951: checking for main in -lglobus_gaa" >&5 +echo "configure:5949: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5955,14 +5953,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <<EOF -#line 5959 "configure" +#line 5957 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5991,7 +5989,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:5995: checking for main in -lglobus_gss" >&5 +echo "configure:5993: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5999,14 +5997,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <<EOF -#line 6003 "configure" +#line 6001 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6035,7 +6033,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:6039: checking for main in -lglobus_gss_assist" >&5 +echo "configure:6037: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6043,14 +6041,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 6047 "configure" +#line 6045 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6079,7 +6077,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:6083: checking for main in -lglobus_io" >&5 +echo "configure:6081: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6087,14 +6085,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <<EOF -#line 6091 "configure" +#line 6089 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6123,7 +6121,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:6127: checking for main in -lglobus_gass_transfer_assist" >&5 +echo "configure:6125: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6131,14 +6129,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 6135 "configure" +#line 6133 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6167,7 +6165,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:6171: checking for main in -lglobus_gass_transfer" >&5 +echo "configure:6169: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6175,14 +6173,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <<EOF -#line 6179 "configure" +#line 6177 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6211,7 +6209,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:6215: checking for globus_gass_open in -lglobus_gass_file" >&5 +echo "configure:6213: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6219,7 +6217,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 6223 "configure" +#line 6221 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6230,7 +6228,7 @@ int main() { globus_gass_open() ; return 0; } EOF -if { (eval echo configure:6234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6260,7 +6258,7 @@ fi else echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6 -echo "configure:6264: checking for globus_module_activate in -lglobus_common" >&5 +echo "configure:6262: checking for globus_module_activate in -lglobus_common" >&5 ac_lib_var=`echo globus_common'_'globus_module_activate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6268,7 +6266,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_common $LIBS" cat > conftest.$ac_ext <<EOF -#line 6272 "configure" +#line 6270 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6279,7 +6277,7 @@ int main() { globus_module_activate() ; return 0; } EOF -if { (eval echo configure:6283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6308,7 +6306,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6 -echo "configure:6312: checking for main in -lglobus_gass_cache" >&5 +echo "configure:6310: checking for main in -lglobus_gass_cache" >&5 ac_lib_var=`echo globus_gass_cache'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6316,14 +6314,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_cache $LIBS" cat > conftest.$ac_ext <<EOF -#line 6320 "configure" +#line 6318 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6352,7 +6350,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6 -echo "configure:6356: checking for main in -lglobus_gaa" >&5 +echo "configure:6354: checking for main in -lglobus_gaa" >&5 ac_lib_var=`echo globus_gaa'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6360,14 +6358,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gaa $LIBS" cat > conftest.$ac_ext <<EOF -#line 6364 "configure" +#line 6362 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6396,7 +6394,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6 -echo "configure:6400: checking for main in -lglobus_gss" >&5 +echo "configure:6398: checking for main in -lglobus_gss" >&5 ac_lib_var=`echo globus_gss'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6404,14 +6402,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss $LIBS" cat > conftest.$ac_ext <<EOF -#line 6408 "configure" +#line 6406 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6440,7 +6438,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6 -echo "configure:6444: checking for main in -lglobus_gss_assist" >&5 +echo "configure:6442: checking for main in -lglobus_gss_assist" >&5 ac_lib_var=`echo globus_gss_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6448,14 +6446,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gss_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 6452 "configure" +#line 6450 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6484,7 +6482,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6 -echo "configure:6488: checking for main in -lglobus_io" >&5 +echo "configure:6486: checking for main in -lglobus_io" >&5 ac_lib_var=`echo globus_io'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6492,14 +6490,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_io $LIBS" cat > conftest.$ac_ext <<EOF -#line 6496 "configure" +#line 6494 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6528,7 +6526,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6 -echo "configure:6532: checking for main in -lglobus_gass_transfer_assist" >&5 +echo "configure:6530: checking for main in -lglobus_gass_transfer_assist" >&5 ac_lib_var=`echo globus_gass_transfer_assist'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6536,14 +6534,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer_assist $LIBS" cat > conftest.$ac_ext <<EOF -#line 6540 "configure" +#line 6538 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6572,7 +6570,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6 -echo "configure:6576: checking for main in -lglobus_gass_transfer" >&5 +echo "configure:6574: checking for main in -lglobus_gass_transfer" >&5 ac_lib_var=`echo globus_gass_transfer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6580,14 +6578,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_transfer $LIBS" cat > conftest.$ac_ext <<EOF -#line 6584 "configure" +#line 6582 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6616,7 +6614,7 @@ unset GASS TESTGASS fi echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6 -echo "configure:6620: checking for globus_gass_open in -lglobus_gass_file" >&5 +echo "configure:6618: checking for globus_gass_open in -lglobus_gass_file" >&5 ac_lib_var=`echo globus_gass_file'_'globus_gass_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6624,7 +6622,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lglobus_gass_file $LIBS" cat > conftest.$ac_ext <<EOF -#line 6628 "configure" +#line 6626 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6635,7 +6633,7 @@ int main() { globus_gass_open() ; return 0; } EOF -if { (eval echo configure:6639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6691,17 +6689,17 @@ case "$withval" in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6695: checking for $ac_hdr" >&5 +echo "configure:6693: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6700 "configure" +#line 6698 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6729,7 +6727,7 @@ fi done echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:6733: checking for main in -lelf" >&5 +echo "configure:6731: checking for main in -lelf" >&5 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6737,14 +6735,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <<EOF -#line 6741 "configure" +#line 6739 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6773,7 +6771,7 @@ unset SRB TESTSRB fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:6777: checking for main in -lsocket" >&5 +echo "configure:6775: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6781,14 +6779,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 6785 "configure" +#line 6783 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6817,7 +6815,7 @@ unset SRB TESTSRB fi echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:6821: checking for clConnect in -lSrbClient" >&5 +echo "configure:6819: checking for clConnect in -lSrbClient" >&5 ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6825,7 +6823,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <<EOF -#line 6829 "configure" +#line 6827 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6836,7 +6834,7 @@ int main() { clConnect() ; return 0; } EOF -if { (eval echo configure:6840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6867,7 +6865,7 @@ fi ;; no) echo $ac_n "checking for SRB""... $ac_c" 1>&6 -echo "configure:6871: checking for SRB" >&5 +echo "configure:6869: checking for SRB" >&5 echo "$ac_t""suppressed" 1>&6 unset SRB TESTSRB ;; @@ -6892,17 +6890,17 @@ echo "configure:6871: checking for SRB" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6896: checking for $ac_hdr" >&5 +echo "configure:6894: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6901 "configure" +#line 6899 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6935,17 +6933,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6939: checking for $ac_hdr" >&5 +echo "configure:6937: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6944 "configure" +#line 6942 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6977,7 +6975,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$srb_lib" echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:6981: checking for main in -lelf" >&5 +echo "configure:6979: checking for main in -lelf" >&5 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6985,14 +6983,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <<EOF -#line 6989 "configure" +#line 6987 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7021,7 +7019,7 @@ unset SRB TESTSRB fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:7025: checking for main in -lsocket" >&5 +echo "configure:7023: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7029,14 +7027,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 7033 "configure" +#line 7031 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7065,7 +7063,7 @@ unset SRB TESTSRB fi echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:7069: checking for clConnect in -lSrbClient" >&5 +echo "configure:7067: checking for clConnect in -lSrbClient" >&5 ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7073,7 +7071,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <<EOF -#line 7077 "configure" +#line 7075 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7084,7 +7082,7 @@ int main() { clConnect() ; return 0; } EOF -if { (eval echo configure:7088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7114,7 +7112,7 @@ fi else echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:7118: checking for main in -lelf" >&5 +echo "configure:7116: checking for main in -lelf" >&5 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7122,14 +7120,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <<EOF -#line 7126 "configure" +#line 7124 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7158,7 +7156,7 @@ unset SRB TESTSRB fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:7162: checking for main in -lsocket" >&5 +echo "configure:7160: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7166,14 +7164,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 7170 "configure" +#line 7168 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7202,7 +7200,7 @@ unset SRB TESTSRB fi echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6 -echo "configure:7206: checking for clConnect in -lSrbClient" >&5 +echo "configure:7204: checking for clConnect in -lSrbClient" >&5 ac_lib_var=`echo SrbClient'_'clConnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7210,7 +7208,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSrbClient $LIBS" cat > conftest.$ac_ext <<EOF -#line 7214 "configure" +#line 7212 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7221,7 +7219,7 @@ int main() { clConnect() ; return 0; } EOF -if { (eval echo configure:7225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7259,463 +7257,9 @@ EOF fi - GRIDSTORAGE="yes" - TESTGRIDSTORAGE='$(srcdir)/testgridstorage' -# Check whether --with-gridstorage or --without-gridstorage was given. -if test "${with_gridstorage+set}" = set; then - withval="$with_gridstorage" - : -else - withval=no -fi - - -case "$withval" in - yes) - for ac_hdr in grid_storage_file.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7280: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 7285 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE -fi -done - - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7318: checking for main in -lgrid_storage_client" >&5 -ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_client $LIBS" -cat > conftest.$ac_ext <<EOF -#line 7326 "configure" -#include "confdefs.h" - -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:7333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lgrid_storage_client $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE -fi - - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7362: checking for grid_storage_open in -lgrid_storage_file" >&5 -ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_file $LIBS" -cat > conftest.$ac_ext <<EOF -#line 7370 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char grid_storage_open(); - -int main() { -grid_storage_open() -; return 0; } -EOF -if { (eval echo configure:7381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lgrid_storage_file $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE -fi - - ;; - no) - echo $ac_n "checking for GRIDSTORAGE""... $ac_c" 1>&6 -echo "configure:7412: checking for GRIDSTORAGE" >&5 - echo "$ac_t""suppressed" 1>&6 - unset GRIDSTORAGE TESTGRIDSTORAGE - ;; - *) - case "$withval" in - *,*) - gridstorage_inc="`echo $withval | cut -f1 -d,`" - gridstorage_lib="`echo $withval | cut -f2 -d, -s`" - ;; - *) - if test -n "$withval"; then - gridstorage_inc="$withval/include" - gridstorage_lib="$withval/lib" - fi - ;; - esac - - if test -n "$gridstorage_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" - for ac_hdr in grid_storage_file.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7437: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 7442 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -CPPFLAGS="$saved_CPPFLAGS" - unset GRIDSTORAGE TESTGRIDSTORAGE -fi -done - - else - for ac_hdr in grid_storage_file.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7480: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 7485 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - fi - - if test -n "$gridstorage_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gridstorage_lib" - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7522: checking for main in -lgrid_storage_client" >&5 -ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_client $LIBS" -cat > conftest.$ac_ext <<EOF -#line 7530 "configure" -#include "confdefs.h" - -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:7537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lgrid_storage_client $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE -fi - - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7566: checking for grid_storage_open in -lgrid_storage_file" >&5 -ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_file $LIBS" -cat > conftest.$ac_ext <<EOF -#line 7574 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char grid_storage_open(); - -int main() { -grid_storage_open() -; return 0; } -EOF -if { (eval echo configure:7585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lgrid_storage_file $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE -fi - - else - echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6 -echo "configure:7615: checking for main in -lgrid_storage_client" >&5 -ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_client $LIBS" -cat > conftest.$ac_ext <<EOF -#line 7623 "configure" -#include "confdefs.h" - -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_client | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lgrid_storage_client $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE -fi - - echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6 -echo "configure:7659: checking for grid_storage_open in -lgrid_storage_file" >&5 -ac_lib_var=`echo grid_storage_file'_'grid_storage_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgrid_storage_file $LIBS" -cat > conftest.$ac_ext <<EOF -#line 7667 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char grid_storage_open(); - -int main() { -grid_storage_open() -; return 0; } -EOF -if { (eval echo configure:7678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo grid_storage_file | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lgrid_storage_file $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset GRIDSTORAGE TESTGRIDSTORAGE -fi - - fi - ;; -esac - -if test -n "$GRIDSTORAGE"; then - cat >> confdefs.h <<\EOF -#define HAVE_GRIDSTORAGE 1 -EOF - -fi - echo $ac_n "checking for PD_open in -lpdb""... $ac_c" 1>&6 -echo "configure:7719: checking for PD_open in -lpdb" >&5 +echo "configure:7263: checking for PD_open in -lpdb" >&5 ac_lib_var=`echo pdb'_'PD_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7723,7 +7267,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpdb $LIBS" cat > conftest.$ac_ext <<EOF -#line 7727 "configure" +#line 7271 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7734,7 +7278,7 @@ int main() { PD_open() ; return 0; } EOF -if { (eval echo configure:7738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7762,7 +7306,7 @@ else fi echo $ac_n "checking for lite_PD_open in -lsilo""... $ac_c" 1>&6 -echo "configure:7766: checking for lite_PD_open in -lsilo" >&5 +echo "configure:7310: checking for lite_PD_open in -lsilo" >&5 ac_lib_var=`echo silo'_'lite_PD_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7770,7 +7314,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsilo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7774 "configure" +#line 7318 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7781,7 +7325,7 @@ int main() { lite_PD_open() ; return 0; } EOF -if { (eval echo configure:7785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7812,17 +7356,17 @@ for ac_hdr in pdb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7816: checking for $ac_hdr" >&5 +echo "configure:7360: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7821 "configure" +#line 7365 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7914,17 +7458,17 @@ case "$withval" in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7918: checking for $ac_hdr" >&5 +echo "configure:7462: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7923 "configure" +#line 7467 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7952,7 +7496,7 @@ done if test `uname` != "FreeBSD"; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:7956: checking for pthread_create in -lpthread" >&5 +echo "configure:7500: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7960,7 +7504,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 7964 "configure" +#line 7508 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7971,7 +7515,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:7975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8007,7 +7551,7 @@ fi ;; no) echo $ac_n "checking for pthread""... $ac_c" 1>&6 -echo "configure:8011: checking for pthread" >&5 +echo "configure:7555: checking for pthread" >&5 echo "$ac_t""suppressed" 1>&6 unset PTHREAD ;; @@ -8032,17 +7576,17 @@ echo "configure:8011: checking for pthread" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8036: checking for $ac_hdr" >&5 +echo "configure:7580: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8041 "configure" +#line 7585 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8074,17 +7618,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8078: checking for $ac_hdr" >&5 +echo "configure:7622: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8083 "configure" +#line 7627 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8117,7 +7661,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$pthread_lib" echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:8121: checking for pthread_create in -lpthread" >&5 +echo "configure:7665: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8125,7 +7669,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 8129 "configure" +#line 7673 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8136,7 +7680,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:8140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8166,7 +7710,7 @@ fi else echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:8170: checking for pthread_create in -lpthread" >&5 +echo "configure:7714: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8174,7 +7718,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 8178 "configure" +#line 7722 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8185,7 +7729,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:8189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8218,7 +7762,7 @@ fi esac echo $ac_n "checking for thread safe support""... $ac_c" 1>&6 -echo "configure:8222: checking for thread safe support" >&5 +echo "configure:7766: checking for thread safe support" >&5 # Check whether --enable-threadsafe or --disable-threadsafe was given. if test "${enable_threadsafe+set}" = set; then enableval="$enable_threadsafe" @@ -8253,7 +7797,7 @@ EOF fi echo $ac_n "checking whether HDF5 v1.2 compatibility functions enabled""... $ac_c" 1>&6 -echo "configure:8257: checking whether HDF5 v1.2 compatibility functions enabled" >&5 +echo "configure:7801: checking whether HDF5 v1.2 compatibility functions enabled" >&5 # Check whether --enable-hdf5v1_2 or --disable-hdf5v1_2 was given. if test "${enable_hdf5v1_2+set}" = set; then enableval="$enable_hdf5v1_2" @@ -8272,7 +7816,7 @@ else fi echo $ac_n "checking for Stream Virtual File Driver support""... $ac_c" 1>&6 -echo "configure:8276: checking for Stream Virtual File Driver support" >&5 +echo "configure:7820: checking for Stream Virtual File Driver support" >&5 # Check whether --enable-stream-vfd or --disable-stream-vfd was given. if test "${enable_stream_vfd+set}" = set; then enableval="$enable_stream_vfd" @@ -8286,17 +7830,17 @@ if test "$STREAM_VFD" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8290: checking for $ac_hdr" >&5 +echo "configure:7834: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8295 "configure" +#line 7839 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8328,9 +7872,9 @@ EOF echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6 -echo "configure:8332: checking if socklen_t is defined" >&5 +echo "configure:7876: checking if socklen_t is defined" >&5 cat > conftest.$ac_ext <<EOF -#line 8334 "configure" +#line 7878 "configure" #include "confdefs.h" #include <stdio.h> @@ -8349,7 +7893,7 @@ int main() { socklen_t foo; return 0; ; return 0; } EOF -if { (eval echo configure:8353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SOCKLEN_T 1 @@ -8369,9 +7913,9 @@ fi echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:8373: checking for tm_gmtoff in struct tm" >&5 +echo "configure:7917: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 8375 "configure" +#line 7919 "configure" #include "confdefs.h" #include <sys/time.h> @@ -8380,7 +7924,7 @@ int main() { struct tm tm; tm.tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:8384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -8396,9 +7940,9 @@ fi rm -f conftest* echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:8400: checking for __tm_gmtoff in struct tm" >&5 +echo "configure:7944: checking for __tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 8402 "configure" +#line 7946 "configure" #include "confdefs.h" #include <sys/time.h> @@ -8407,7 +7951,7 @@ int main() { struct tm tm; tm.__tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:8411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE___TM_GMTOFF 1 @@ -8423,9 +7967,9 @@ fi rm -f conftest* echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:8427: checking for global timezone variable" >&5 +echo "configure:7971: checking for global timezone variable" >&5 cat > conftest.$ac_ext <<EOF -#line 8429 "configure" +#line 7973 "configure" #include "confdefs.h" #include <sys/time.h> @@ -8434,7 +7978,7 @@ int main() { timezone=0; ; return 0; } EOF -if { (eval echo configure:8438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -8450,12 +7994,12 @@ fi rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:8454: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:7998: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8459 "configure" +#line 8003 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -8463,7 +8007,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:8467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -8484,12 +8028,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:8488: checking for tm_zone in struct tm" >&5 +echo "configure:8032: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8493 "configure" +#line 8037 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -8497,7 +8041,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:8501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -8517,12 +8061,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:8521: checking for tzname" >&5 +echo "configure:8065: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8526 "configure" +#line 8070 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -8532,7 +8076,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:8536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -8554,9 +8098,9 @@ EOF fi echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:8558: checking for struct timezone" >&5 +echo "configure:8102: checking for struct timezone" >&5 cat > conftest.$ac_ext <<EOF -#line 8560 "configure" +#line 8104 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8566,7 +8110,7 @@ int main() { struct timezone tz; tz.tz_minuteswest=0; ; return 0; } EOF -if { (eval echo configure:8570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TIMEZONE 1 @@ -8582,9 +8126,9 @@ fi rm -f conftest* echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:8586: checking for st_blocks in struct stat" >&5 +echo "configure:8130: checking for st_blocks in struct stat" >&5 cat > conftest.$ac_ext <<EOF -#line 8588 "configure" +#line 8132 "configure" #include "confdefs.h" #include <sys/stat.h> @@ -8592,7 +8136,7 @@ int main() { struct stat sb; sb.st_blocks=0; ; return 0; } EOF -if { (eval echo configure:8596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STAT_ST_BLOCKS 1 @@ -8610,12 +8154,12 @@ rm -f conftest* for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8614: checking for $ac_func" >&5 +echo "configure:8158: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8619 "configure" +#line 8163 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8638,7 +8182,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8665,12 +8209,12 @@ done for ac_func in _scrsize ioctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8669: checking for $ac_func" >&5 +echo "configure:8213: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8674 "configure" +#line 8218 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8693,7 +8237,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8719,16 +8263,16 @@ done echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6 -echo "configure:8723: checking for struct videoconfig" >&5 +echo "configure:8267: checking for struct videoconfig" >&5 cat > conftest.$ac_ext <<EOF -#line 8725 "configure" +#line 8269 "configure" #include "confdefs.h" int main() { struct videoconfig w; w.numtextcols=0; ; return 0; } EOF -if { (eval echo configure:8732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_VIDEOCONFIG 1 @@ -8744,16 +8288,16 @@ fi rm -f conftest* echo $ac_n "checking for struct text_info""... $ac_c" 1>&6 -echo "configure:8748: checking for struct text_info" >&5 +echo "configure:8292: checking for struct text_info" >&5 cat > conftest.$ac_ext <<EOF -#line 8750 "configure" +#line 8294 "configure" #include "confdefs.h" int main() { struct text_info w; w.screenwidth=0; ; return 0; } EOF -if { (eval echo configure:8757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TEXT_INFO 1 @@ -8769,16 +8313,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:8773: checking for TIOCGWINSZ" >&5 +echo "configure:8317: checking for TIOCGWINSZ" >&5 cat > conftest.$ac_ext <<EOF -#line 8775 "configure" +#line 8319 "configure" #include "confdefs.h" #include <sys/ioctl.h> int main() { int w=TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:8782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ 1 @@ -8794,16 +8338,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6 -echo "configure:8798: checking for TIOCGGETD" >&5 +echo "configure:8342: checking for TIOCGGETD" >&5 cat > conftest.$ac_ext <<EOF -#line 8800 "configure" +#line 8344 "configure" #include "confdefs.h" #include <sys/ioctl.h> int main() { int w=TIOCGETD; ; return 0; } EOF -if { (eval echo configure:8807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGETD 1 @@ -8822,12 +8366,12 @@ rm -f conftest* for ac_func in compress2 difftime fork gethostname getpwuid getrusage do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8826: checking for $ac_func" >&5 +echo "configure:8370: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8831 "configure" +#line 8375 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8850,7 +8394,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8877,12 +8421,12 @@ done for ac_func in gettimeofday BSDgettimeofday longjmp setsysinfo sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8881: checking for $ac_func" >&5 +echo "configure:8425: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8886 "configure" +#line 8430 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8905,7 +8449,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8932,12 +8476,12 @@ done for ac_func in signal snprintf vsnprintf strdup system waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8936: checking for $ac_func" >&5 +echo "configure:8480: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8941 "configure" +#line 8485 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8960,7 +8504,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8986,12 +8530,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8990: checking for working const" >&5 +echo "configure:8534: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8995 "configure" +#line 8539 "configure" #include "confdefs.h" int main() { @@ -9040,7 +8584,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:9044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9061,21 +8605,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9065: checking for inline" >&5 +echo "configure:8609: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 9072 "configure" +#line 8616 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:9079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9102,16 +8646,16 @@ esac echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6 -echo "configure:9106: checking for __attribute__ extension" >&5 +echo "configure:8650: checking for __attribute__ extension" >&5 cat > conftest.$ac_ext <<EOF -#line 9108 "configure" +#line 8652 "configure" #include "confdefs.h" int main() { int __attribute__((unused)) x ; return 0; } EOF -if { (eval echo configure:9115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_ATTRIBUTE 1 @@ -9127,16 +8671,16 @@ fi rm -f conftest* echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6 -echo "configure:9131: checking for __FUNCTION__ extension" >&5 +echo "configure:8675: checking for __FUNCTION__ extension" >&5 cat > conftest.$ac_ext <<EOF -#line 9133 "configure" +#line 8677 "configure" #include "confdefs.h" int main() { (void)__FUNCTION__ ; return 0; } EOF -if { (eval echo configure:9140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FUNCTION 1 @@ -9152,7 +8696,7 @@ fi rm -f conftest* echo $ac_n "checking how to print long long""... $ac_c" 1>&6 -echo "configure:9156: checking how to print long long" >&5 +echo "configure:8700: checking how to print long long" >&5 if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9164,7 +8708,7 @@ for hdf5_cv_printf_ll in l L q ll unknown; do continue else cat > conftest.$ac_ext <<EOF -#line 9168 "configure" +#line 8712 "configure" #include "confdefs.h" #include <stdio.h> @@ -9180,7 +8724,7 @@ int main(void) } EOF -if { (eval echo configure:9184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then break else @@ -9201,7 +8745,7 @@ EOF echo $ac_n "checking for debug flags""... $ac_c" 1>&6 -echo "configure:9205: checking for debug flags" >&5 +echo "configure:8749: checking for debug flags" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -9239,7 +8783,7 @@ if test -n "$DEBUG_PKG"; then fi echo $ac_n "checking for API tracing""... $ac_c" 1>&6 -echo "configure:9243: checking for API tracing" >&5; +echo "configure:8787: checking for API tracing" >&5; # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -9315,7 +8859,7 @@ case "$CC_BASENAME" in mpicc) PARALLEL=mpicc echo $ac_n "checking for mpirun""... $ac_c" 1>&6 -echo "configure:9319: checking for mpirun" >&5 +echo "configure:8863: checking for mpirun" >&5 cmd=`echo $CC | cut -f1 -d' '` if (echo $cmd | grep / >/dev/null); then @@ -9342,7 +8886,7 @@ echo "configure:9319: checking for mpirun" >&5 hcc) PARALLEL=hcc echo $ac_n "checking for mpirun_lam or mpirun""... $ac_c" 1>&6 -echo "configure:9346: checking for mpirun_lam or mpirun" >&5 +echo "configure:8890: checking for mpirun_lam or mpirun" >&5 cmd=`echo $CC | cut -f1 -d' '` if (echo $cmd | grep / >/dev/null); then @@ -9388,7 +8932,7 @@ fi echo $ac_n "checking for parallel support files""... $ac_c" 1>&6 -echo "configure:9392: checking for parallel support files" >&5 +echo "configure:8936: checking for parallel support files" >&5 case "X-$enable_parallel" in X-|X-no|X-none) echo "$ac_t""skipped" 1>&6 @@ -9399,21 +8943,21 @@ case "X-$enable_parallel" in PARALLEL=yes cat > conftest.$ac_ext <<EOF -#line 9403 "configure" +#line 8947 "configure" #include "confdefs.h" int main() { MPI_Init() ; return 0; } EOF -if { (eval echo configure:9410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6 -echo "configure:9417: checking for MPI_Init in -lmpi" >&5 +echo "configure:8961: checking for MPI_Init in -lmpi" >&5 ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9421,7 +8965,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpi $LIBS" cat > conftest.$ac_ext <<EOF -#line 9425 "configure" +#line 8969 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9432,7 +8976,7 @@ int main() { MPI_Init() ; return 0; } EOF -if { (eval echo configure:9436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9465,21 +9009,21 @@ rm -f conftest* if test "X$PARALLEL" = "Xyes"; then cat > conftest.$ac_ext <<EOF -#line 9469 "configure" +#line 9013 "configure" #include "confdefs.h" int main() { MPI_File_open() ; return 0; } EOF -if { (eval echo configure:9476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_File_open in -lmpio""... $ac_c" 1>&6 -echo "configure:9483: checking for MPI_File_open in -lmpio" >&5 +echo "configure:9027: checking for MPI_File_open in -lmpio" >&5 ac_lib_var=`echo mpio'_'MPI_File_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9487,7 +9031,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpio $LIBS" cat > conftest.$ac_ext <<EOF -#line 9491 "configure" +#line 9035 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9498,7 +9042,7 @@ int main() { MPI_File_open() ; return 0; } EOF -if { (eval echo configure:9502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9541,7 +9085,7 @@ rm -f conftest* PARALLEL=mpich echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6 -echo "configure:9545: checking for MPI_Init in -lmpich" >&5 +echo "configure:9089: checking for MPI_Init in -lmpich" >&5 ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9549,7 +9093,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpich $LIBS" cat > conftest.$ac_ext <<EOF -#line 9553 "configure" +#line 9097 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9560,7 +9104,7 @@ int main() { MPI_Init() ; return 0; } EOF -if { (eval echo configure:9564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9607,23 +9151,23 @@ EOF echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6 -echo "configure:9611: checking prefix for running on one processor" >&5 +echo "configure:9155: checking prefix for running on one processor" >&5 echo "$ac_t""$RUNSERIAL" 1>&6 echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6 -echo "configure:9614: checking prefix for running in parallel" >&5 +echo "configure:9158: checking prefix for running in parallel" >&5 echo "$ac_t""$RUNPARALLEL" 1>&6 echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6 -echo "configure:9618: checking whether a simple MPI-IO program can be linked" >&5 +echo "configure:9162: checking whether a simple MPI-IO program can be linked" >&5 cat > conftest.$ac_ext <<EOF -#line 9620 "configure" +#line 9164 "configure" #include "confdefs.h" int main() { MPI_Init();MPI_File_open(); ; return 0; } EOF -if { (eval echo configure:9627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -9993,8 +9537,6 @@ s%@GASS@%$GASS%g s%@TESTGASS@%$TESTGASS%g s%@SRB@%$SRB%g s%@TESTSRB@%$TESTSRB%g -s%@GRIDSTORAGE@%$GRIDSTORAGE%g -s%@TESTGRIDSTORAGE@%$TESTGRIDSTORAGE%g s%@PDB2HDF@%$PDB2HDF%g s%@PTHREAD@%$PTHREAD%g s%@DEBUG_PKG@%$DEBUG_PKG%g @@ -10487,9 +10029,6 @@ IF_YES_NO "$HDF_FORTRAN" PRINT_N " GASS" IF_YES_NO "$GASS" -PRINT_N " GridStorage" -IF_YES_NO "$GRIDSTORAGE" - PRINT_N " HDF4" IF_YES_NO "$HAVE_HDF4" diff --git a/configure.in b/configure.in index 523aa34..67d4c0e 100644 --- a/configure.in +++ b/configure.in @@ -926,72 +926,6 @@ if test -n "$SRB"; then fi dnl ---------------------------------------------------------------------- -dnl Is Grid Storage present? If so then we can compile in the Grid -dnl Storage driver. -dnl -AC_SUBST(GRIDSTORAGE) GRIDSTORAGE="yes" -AC_SUBST(TESTGRIDSTORAGE) TESTGRIDSTORAGE='$(srcdir)/testgridstorage' -AC_ARG_WITH(gridstorage, - [ --with-gridstorage[=DIR] Use the Globus Grid Storage driver [default=no]],, - withval=no) - -case "$withval" in - yes) - AC_CHECK_HEADERS(grid_storage_file.h,,unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - ;; - no) - AC_MSG_CHECKING(for GRIDSTORAGE) - AC_MSG_RESULT(suppressed) - unset GRIDSTORAGE TESTGRIDSTORAGE - ;; - *) - case "$withval" in - *,*) - gridstorage_inc="`echo $withval | cut -f1 -d,`" - gridstorage_lib="`echo $withval | cut -f2 -d, -s`" - ;; - *) - if test -n "$withval"; then - gridstorage_inc="$withval/include" - gridstorage_lib="$withval/lib" - fi - ;; - esac - - if test -n "$gridstorage_inc"; then - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$gridstorage_inc" - AC_CHECK_HEADERS(grid_storage_file.h,, - CPPFLAGS="$saved_CPPFLAGS" - unset GRIDSTORAGE TESTGRIDSTORAGE) - else - AC_CHECK_HEADERS(grid_storage_file.h) - fi - - if test -n "$gridstorage_lib"; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$gridstorage_lib" - AC_CHECK_LIB(grid_storage_client,main,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - else - AC_CHECK_LIB(grid_storage_client,main,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - AC_CHECK_LIB(grid_storage_file,grid_storage_open,, - unset GRIDSTORAGE TESTGRIDSTORAGE) - fi - ;; -esac - -if test -n "$GRIDSTORAGE"; then - AC_DEFINE(HAVE_GRIDSTORAGE) -fi - -dnl ---------------------------------------------------------------------- dnl Is LLNL's PDB present? If so then we'll compile the PDB-to-HDF5 dnl translator. dnl @@ -1919,9 +1853,6 @@ IF_YES_NO "$HDF_FORTRAN" PRINT_N " GASS" IF_YES_NO "$GASS" -PRINT_N " GridStorage" -IF_YES_NO "$GRIDSTORAGE" - PRINT_N " HDF4" IF_YES_NO "$HAVE_HDF4" diff --git a/examples/Dependencies b/examples/Dependencies index 2d9bdaa..cb26e93 100644 --- a/examples/Dependencies +++ b/examples/Dependencies @@ -32,7 +32,6 @@ h5_chunk_read.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -67,7 +66,6 @@ h5_compound.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -102,7 +100,6 @@ h5_extend_write.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -137,7 +134,6 @@ h5_group.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -172,7 +168,6 @@ h5_read.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -207,7 +202,6 @@ h5_write.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -242,7 +236,6 @@ h5_select.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -277,7 +270,6 @@ h5_attribute.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -312,7 +304,6 @@ h5_mount.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -347,7 +338,40 @@ h5_reference.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ + $(top_srcdir)/src/H5FDstream.h \ + $(top_srcdir)/src/H5FDmulti.h \ + $(top_srcdir)/src/H5FDlog.h +h5_drivers.lo: \ + $(srcdir)/h5_drivers.c \ + $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/src/H5public.h \ + $(top_builddir)/src/H5pubconf.h \ + $(top_srcdir)/src/H5api_adpt.h \ + $(top_srcdir)/src/H5Ipublic.h \ + $(top_srcdir)/src/H5Apublic.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/H5HGpublic.h \ + $(top_srcdir)/src/H5HLpublic.h \ + $(top_srcdir)/src/H5MMpublic.h \ + $(top_srcdir)/src/H5Opublic.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/H5FDmpio.h \ + $(top_srcdir)/src/H5FDsec2.h \ + $(top_srcdir)/src/H5FDstdio.h \ + $(top_srcdir)/src/H5FDsrb.h \ + $(top_srcdir)/src/H5FDgass.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -382,7 +406,6 @@ ph5example.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h diff --git a/fortran/src/Dependencies b/fortran/src/Dependencies index 6fa052b..81227fa 100644 --- a/fortran/src/Dependencies +++ b/fortran/src/Dependencies @@ -33,7 +33,6 @@ H5f90kit.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -72,7 +71,6 @@ H5_f.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -110,7 +108,6 @@ H5Git.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -147,7 +144,6 @@ H5Rf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -186,7 +182,6 @@ H5Ff.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -225,7 +220,6 @@ H5Sf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -264,7 +258,6 @@ H5Df.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -303,7 +296,6 @@ H5Gf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -342,7 +334,6 @@ H5Af.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -381,7 +372,6 @@ H5Tf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -420,7 +410,6 @@ H5Pf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -459,7 +448,6 @@ H5If.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -498,7 +486,6 @@ H5Ef.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ diff --git a/pablo/Makefile.in b/pablo/Makefile.in index c70c933..8aeb0b6 100644 --- a/pablo/Makefile.in +++ b/pablo/Makefile.in @@ -39,7 +39,7 @@ LIB_SRC= \ H5F.c H5Farray.c H5Oattr.c H5R.c H5Tvlen.c \ H5FD.c H5Fcontig.c H5Ocomp.c H5S.c H5V.c \ H5FDcore.c H5Fistore.c H5Ocont.c H5Sall.c H5Z.c \ - H5FDdpss.c H5Fseq.c H5Odtype.c H5Shyper.c H5Zdeflate.c \ + H5Fseq.c H5Odtype.c H5Shyper.c H5Zdeflate.c \ H5FDfamily.c H5G.c H5Oefl.c H5Smpio.c H5detect.c \ H5FDgass.c H5Gent.c H5Ofill.c H5Snone.c \ H5FDlog.c H5Gnode.c H5Olayout.c H5Spoint.c \ diff --git a/perform/Dependencies b/perform/Dependencies index 173aa04..0e42dae 100644 --- a/perform/Dependencies +++ b/perform/Dependencies @@ -32,7 +32,6 @@ iopipe.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -69,7 +68,6 @@ chunk.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -104,11 +102,74 @@ overhead.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h mpi-perf.lo: \ - $(srcdir)/mpi-perf.c + $(srcdir)/mpi-perf.c \ + $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/src/H5public.h \ + $(top_builddir)/src/H5pubconf.h \ + $(top_srcdir)/src/H5api_adpt.h \ + $(top_srcdir)/src/H5Ipublic.h \ + $(top_srcdir)/src/H5Apublic.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/H5HGpublic.h \ + $(top_srcdir)/src/H5HLpublic.h \ + $(top_srcdir)/src/H5MMpublic.h \ + $(top_srcdir)/src/H5Opublic.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/H5FDmpio.h \ + $(top_srcdir)/src/H5FDsec2.h \ + $(top_srcdir)/src/H5FDstdio.h \ + $(top_srcdir)/src/H5FDsrb.h \ + $(top_srcdir)/src/H5FDgass.h \ + $(top_srcdir)/src/H5FDstream.h \ + $(top_srcdir)/src/H5FDmulti.h \ + $(top_srcdir)/src/H5FDlog.h perf.lo: \ - $(srcdir)/perf.c + $(srcdir)/perf.c \ + $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/src/H5public.h \ + $(top_builddir)/src/H5pubconf.h \ + $(top_srcdir)/src/H5api_adpt.h \ + $(top_srcdir)/src/H5Ipublic.h \ + $(top_srcdir)/src/H5Apublic.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/H5HGpublic.h \ + $(top_srcdir)/src/H5HLpublic.h \ + $(top_srcdir)/src/H5MMpublic.h \ + $(top_srcdir)/src/H5Opublic.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/H5FDmpio.h \ + $(top_srcdir)/src/H5FDsec2.h \ + $(top_srcdir)/src/H5FDstdio.h \ + $(top_srcdir)/src/H5FDsrb.h \ + $(top_srcdir)/src/H5FDgass.h \ + $(top_srcdir)/src/H5FDstream.h \ + $(top_srcdir)/src/H5FDmulti.h \ + $(top_srcdir)/src/H5FDlog.h diff --git a/src/Dependencies b/src/Dependencies index 28c9767..4f2ff47 100644 --- a/src/Dependencies +++ b/src/Dependencies @@ -212,7 +212,6 @@ H5F.lo: \ $(srcdir)/H5FDmpio.h \ $(srcdir)/H5FDpublic.h \ $(srcdir)/H5FDgass.h \ - $(srcdir)/H5FDdpss.h \ $(srcdir)/H5FDstream.h \ $(srcdir)/H5FDsrb.h \ $(srcdir)/H5FDmulti.h \ @@ -600,46 +599,6 @@ H5FDcore.lo: \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Sprivate.h -H5FDdpss.lo: \ - $(srcdir)/H5FDdpss.c \ - $(srcdir)/hdf5.h \ - $(srcdir)/H5public.h \ - H5pubconf.h \ - $(srcdir)/H5api_adpt.h \ - $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5Apublic.h \ - $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Bpublic.h \ - $(srcdir)/H5Dpublic.h \ - $(srcdir)/H5Epublic.h \ - $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5Gpublic.h \ - $(srcdir)/H5HGpublic.h \ - $(srcdir)/H5HLpublic.h \ - $(srcdir)/H5MMpublic.h \ - $(srcdir)/H5Opublic.h \ - $(srcdir)/H5Ppublic.h \ - $(srcdir)/H5Zpublic.h \ - $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Tpublic.h \ - $(srcdir)/H5FDcore.h \ - $(srcdir)/H5FDfamily.h \ - $(srcdir)/H5FDmpio.h \ - $(srcdir)/H5FDsec2.h \ - $(srcdir)/H5FDstdio.h \ - $(srcdir)/H5FDsrb.h \ - $(srcdir)/H5FDgass.h \ - $(srcdir)/H5FDdpss.h \ - $(srcdir)/H5FDstream.h \ - $(srcdir)/H5FDmulti.h \ - $(srcdir)/H5FDlog.h \ - $(srcdir)/H5Eprivate.h \ - $(srcdir)/H5private.h \ - H5config.h \ - $(srcdir)/H5FDprivate.h \ - $(srcdir)/H5MMprivate.h H5FDmulti.lo: \ $(srcdir)/H5FDmulti.c \ $(srcdir)/hdf5.h \ @@ -671,7 +630,6 @@ H5FDmulti.lo: \ $(srcdir)/H5FDstdio.h \ $(srcdir)/H5FDsrb.h \ $(srcdir)/H5FDgass.h \ - $(srcdir)/H5FDdpss.h \ $(srcdir)/H5FDstream.h \ $(srcdir)/H5FDmulti.h \ $(srcdir)/H5FDlog.h @@ -824,7 +782,6 @@ H5FDstdio.lo: \ $(srcdir)/H5FDstdio.h \ $(srcdir)/H5FDsrb.h \ $(srcdir)/H5FDgass.h \ - $(srcdir)/H5FDdpss.h \ $(srcdir)/H5FDstream.h \ $(srcdir)/H5FDmulti.h \ $(srcdir)/H5FDlog.h @@ -23,7 +23,6 @@ #include "H5FDfamily.h" /*family of files */ #include "H5FDmpio.h" /*MPI-2 I/O */ #include "H5FDgass.h" /*GASS I/O */ -#include "H5FDdpss.h" /*Grid Storage I/O */ #include "H5FDstream.h" /*in-memory files streamed via sockets */ #include "H5FDsrb.h" /*SRB I/O */ #include "H5FDmulti.h" /*multiple files partitioned by mem usage */ @@ -205,9 +204,6 @@ H5F_init_interface(void) #ifdef H5_HAVE_GASS if ((status=H5FD_GASS)<0) goto end_registration; #endif -#ifdef H5_HAVE_GRIDSTORAGE - if ((status=H5FD_DPSS)<0) goto end_registration; -#endif #ifdef H5_HAVE_SRB if ((status=H5FD_SRB)<0) goto end_registration; #endif diff --git a/src/H5FDdpss.c b/src/H5FDdpss.c deleted file mode 100644 index e59e80d..0000000 --- a/src/H5FDdpss.c +++ /dev/null @@ -1,663 +0,0 @@ -/* - * Copyright © 1999 NCSA - * All rights reserved. - * - * Programmer: Thomas Radke <tradke@aei-potsdam.mpg.de> - * Monday, October 11, 1999 - * - * Purpose: This is the Distributed Parallel Storage System I/O driver. - * - */ - -#include "hdf5.h" -#include "H5Eprivate.h" /*error handling */ -#include "H5FDprivate.h" /*file driver */ -#include "H5FDdpss.h" -#include "H5MMprivate.h" /*memory management */ - -#ifdef COALESCE_READS -/* Packages needed by this file.*/ -#include "H5Fprivate.h" -#include "H5Iprivate.h" -#endif - - -/* uncomment this to get some debugging output from this driver */ -#if 1 -#define DEBUG 1 -#endif - -/* The driver identification number, initialized at runtime */ -static hid_t H5FD_DPSS_g = 0; - - -/* compile this only if HDF5 was configured to use the Grid Storage I/O driver */ -#ifdef H5_HAVE_GRIDSTORAGE - -/* include the Storage Client header */ -#include <grid_storage_file.h> - -/* - * 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). - * When opening a file the `eof' will be set to the current file size, - * `eoa' will be set * to zero. - */ -typedef struct H5FD_dpss_t { - H5FD_t pub; /* public stuff, must be first */ - grid_storage_handle_t handle; /* the DPSS file handle */ - haddr_t eoa; /* end of allocated region */ - haddr_t eof; /* end of file; current file size */ -} H5FD_dpss_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(). - */ -#ifdef H5_HAVE_LSEEK64 -# define file_offset_t off64_t -# define file_seek lseek64 -#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)) - -#define PRINT_GLOBUS_ERROR_MSG(globus_result) \ - { \ - char *globus_error_msg; \ - \ - globus_error_msg = globus_object_printable_to_string ( \ - globus_error_get (globus_result)); \ - if (globus_error_msg) { \ - /*** FIXME: put appropriate minor error code in here ***/ \ - HERROR (H5E_IO, -1, globus_error_msg); \ - globus_free (globus_error_msg); \ - } \ - } - -/* Grid Storage driver function prototypes */ -static H5FD_t *H5FD_dpss_open (const char *name, unsigned flags, - hid_t UNUSED fapl_id, haddr_t maxaddr); -static herr_t H5FD_dpss_close (H5FD_t *_file); -static herr_t H5FD_dpss_query(const H5FD_t *_f1, unsigned long *flags); -static haddr_t H5FD_dpss_get_eoa (H5FD_t *_file); -static herr_t H5FD_dpss_set_eoa (H5FD_t *_file, haddr_t addr); -static haddr_t H5FD_dpss_get_eof (H5FD_t *_file); -static herr_t H5FD_dpss_read (H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, - hsize_t size, void *buf); -static herr_t H5FD_dpss_write (H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED fapl_id,haddr_t addr, - hsize_t size, const void *buf); - -/* The Grid Storage I/O driver information */ -static const H5FD_class_t H5FD_dpss_g = { - "dpss", /* name */ - MAXADDR, /* maxaddr */ - NULL, /* sb_size */ - NULL, /* sb_encode */ - NULL, /* sb_decode */ - 0, /* fapl_size */ - NULL, /* fapl_get */ - NULL, /* fapl_copy */ - NULL, /* fapl_free */ - 0, /* dxpl_size */ - NULL, /* dxpl_copy */ - NULL, /* dxpl_free */ - H5FD_dpss_open, /* open */ - H5FD_dpss_close, /* close */ - NULL, /* cmp */ - H5FD_dpss_query, /* query */ - NULL, /* alloc */ - NULL, /* free */ - H5FD_dpss_get_eoa, /* get_eoa */ - H5FD_dpss_set_eoa, /* set_eoa */ - H5FD_dpss_get_eof, /* get_eof */ - H5FD_dpss_read, /* read */ - H5FD_dpss_write, /* write */ - NULL, /* flush */ - H5FD_FLMAP_SINGLE, /* fl_map */ -}; - -/* Interface initialization */ -#define PABLO_MASK H5FD_dpss_mask -#define INTERFACE_INIT H5FD_dpss_init -static int interface_initialize_g = 0; - - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_init - * - * Purpose: Initialize this driver by registering the driver with the - * library. - * - * Return: Success: The driver ID for the DPSS driver. - * - * Failure: Negative. - * - * Programmer: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -hid_t -H5FD_dpss_init (void) -{ - int globus_result; /* NOTE: globus_module_activate() doesn't - return a globus_result_t type */ - - FUNC_ENTER (H5FD_dpss_init, FAIL); - - /* register the DPSS driver if it wasn't already */ - if (! H5FD_DPSS_g) - H5FD_DPSS_g = H5FDregister (&H5FD_dpss_g); - - /* active the DPSS storage client module which in turn activates - all other Globus modules that are needed */ - if (H5FD_DPSS_g >= 0) { - globus_result = globus_module_activate (GRID_STORAGE_FILE_MODULE); - if (GLOBUS_SUCCESS != globus_result) { - H5FDunregister (H5FD_DPSS_g); - H5FD_DPSS_g = -1; - HRETURN_ERROR (H5E_IO, H5E_CANTINIT, FAIL, - "Cannot activate Globus Grid Storage File module"); - } - } - - FUNC_LEAVE (H5FD_DPSS_g); -} - - -/*------------------------------------------------------------------------- - * Function: H5Pset_fapl_dpss - * - * Purpose: Modify the file application list to use the DPSS I/O - * driver defined in this source file. - * - * Return: Success: Non-negative - * - * Failure: Negative - * - * Programmer: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_fapl_dpss(hid_t fapl_id) -{ - herr_t ret_value=FAIL; - - FUNC_ENTER (H5Pset_fapl_dpss, FAIL); - H5TRACE1("e","i",fapl_id); - - /* Check arguments */ - if (H5P_FILE_ACCESS != H5Pget_class (fapl_id)) - HRETURN_ERROR (H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl"); - - ret_value = H5Pset_driver (fapl_id, H5FD_DPSS, NULL); - - FUNC_LEAVE (ret_value); -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_open - * - * Purpose: Creates/opens a DPSS file instance identified by its URL - * as an HDF5 file. - * - * 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: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static H5FD_t * -H5FD_dpss_open (const char *name, unsigned flags, hid_t UNUSED fapl_id, - haddr_t maxaddr) -{ - int i; - globus_result_t globus_result; - grid_storage_url_t *url = (grid_storage_url_t *) name; - grid_storage_handle_t handle; - H5FD_dpss_t *file; - unsigned int o_flags; - char int_attribute_value [10]; - int64_t file_size; - char **property_names, - **property_values; - grid_storage_attribute_t attributes = GRID_STORAGE_ATTRIBUTE_INITIALIZER; - - - FUNC_ENTER (H5FD_dpss_open, NULL); - -#ifdef DEBUG - fprintf (stdout, "H5FD_dpss_open: name='%s', flags=0x%x\n", name, flags); -#endif - - /* Check arguments */ - if (!name || !*name) - HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name"); - if (0==maxaddr || HADDR_UNDEF==maxaddr) - HRETURN_ERROR (H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr"); - if (ADDR_OVERFLOW (maxaddr)) - HRETURN_ERROR (H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr"); - - /* Build the open flags */ - o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY; - if (H5F_ACC_TRUNC & flags) o_flags |= O_TRUNC; - if (H5F_ACC_CREAT & flags) o_flags |= O_CREAT; - if (H5F_ACC_EXCL & flags) o_flags |= O_EXCL; - sprintf (int_attribute_value, "%d", o_flags); - - /* set the 'open flags' attribute */ - globus_result = - grid_storage_add_attribute (GRID_STORAGE_ATTRIBUTE_OPEN_FLAGS, - int_attribute_value, &attributes); - if (GLOBUS_SUCCESS != globus_result) { - PRINT_GLOBUS_ERROR_MSG (globus_result); - HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL, - "Can't set attributes for file instance"); - } - - /* open the file instance */ - globus_result = grid_storage_open ((grid_storage_url_t *) url, &handle, - &attributes); - if (GLOBUS_SUCCESS != globus_result) { - PRINT_GLOBUS_ERROR_MSG (globus_result); - HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL, - "Can't open file instance"); - } - - /* Get the size of the file instance. - Read all the instance properties ... */ - globus_result = grid_storage_list_properties (url, NULL, &property_names, - &property_values); - if (GLOBUS_SUCCESS != globus_result) { - PRINT_GLOBUS_ERROR_MSG (globus_result); - grid_storage_close (&handle, NULL); - HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL, - "Can't get properties of file instance"); - } - /* ... now sort out the 'size' property */ - file_size = -1; - for (i = 0; property_names [i]; i++) { - if (strcmp (property_names [i], GRID_STORAGE_PROPERTY_SIZE) == 0) { - if (property_values [i]) - sscanf (property_values [i], "%"PRINTF_LL_WIDTH"u", &file_size); - } - /* don't forget to free the allocated property strings */ - globus_libc_free (property_names [i]); - globus_libc_free (property_values [i]); - } - globus_libc_free (property_names); - globus_libc_free (property_values); - - /* Did we find a size ? */ - if (file_size < 0) { - grid_storage_close (&handle, NULL); - HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL, - "Can't get size of file instance"); - } - - /* Create the new file struct */ - if (NULL == (file = (H5FD_dpss_t *) H5MM_calloc (sizeof (H5FD_dpss_t)))) - HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, - "Can't allocate file struct"); - file->handle = handle; - file->eof = (haddr_t) file_size; - - FUNC_LEAVE ((H5FD_t *) file); -} - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_close -* - * Purpose: Closes a previously opened DPSS file instance. - * - * Return: Success: 0 - * - * Failure: -1, file not closed. - * - * Programmer: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_dpss_close (H5FD_t *_file) -{ - globus_result_t globus_result; - H5FD_dpss_t *file = (H5FD_dpss_t *) _file; - - FUNC_ENTER (H5FD_dpss_close, FAIL); - - if (NULL == file) - HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle"); - - globus_result = grid_storage_close (&file->handle, NULL); - if (GLOBUS_SUCCESS != globus_result) { - PRINT_GLOBUS_ERROR_MSG (globus_result); - HRETURN_ERROR (H5E_IO, H5E_CANTCLOSEFILE, FAIL, "Failed to close file instance"); - } - - H5MM_xfree (file); - - FUNC_LEAVE (SUCCEED); -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_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_dpss_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */) -{ - herr_t ret_value=SUCCEED; - - FUNC_ENTER(H5FD_dpss_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 */ - } - - FUNC_LEAVE(ret_value); -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_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. - * - * Programmer: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static haddr_t -H5FD_dpss_get_eoa (H5FD_t *_file) -{ - H5FD_dpss_t *file = (H5FD_dpss_t *) _file; - - FUNC_ENTER (H5FD_dpss_get_eoa, HADDR_UNDEF); - - FUNC_LEAVE (file->eoa); -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_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: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_dpss_set_eoa (H5FD_t *_file, haddr_t addr) -{ - H5FD_dpss_t *file = (H5FD_dpss_t *) _file; - - FUNC_ENTER (H5FD_dpss_set_eoa, FAIL); - - file->eoa = addr; - - FUNC_LEAVE (SUCCEED); -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_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 DPSS - * file or the HDF5 file. - * - * Programmer: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static haddr_t -H5FD_dpss_get_eof (H5FD_t *_file) -{ - H5FD_dpss_t *file = (H5FD_dpss_t*) _file; - - FUNC_ENTER (H5FD_dpss_get_eof, HADDR_UNDEF); - - FUNC_LEAVE (file->eof > file->eoa ? file->eof : file->eoa); -} - - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_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: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_dpss_read (H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t addr, - hsize_t size, void *buf/*out*/) -{ - H5FD_dpss_t *file = (H5FD_dpss_t *) _file; - globus_result_t globus_result; -#ifdef COALESCE_READS - static int count = 0; /* counter for single reads */ - H5F_xfer_t *xfer_parms; /*transfer property list*/ -#endif - - FUNC_ENTER (H5FD_dpss_read, FAIL); - -#ifdef DEBUG - fprintf (stdout, "H5FD_dpss_read: addr 0x%lx, size %ld\n", - (unsigned long int) addr, (unsigned long int) size); -#endif - - /* Check parameters */ - if (! file) - HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle"); - if (! buf) - HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer pointer"); - - /* Check for overflow conditions */ - if (HADDR_UNDEF == addr) - HRETURN_ERROR (H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined"); - if (REGION_OVERFLOW (addr, size)) - HRETURN_ERROR (H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large"); - if (addr + size > file->eoa) - HRETURN_ERROR (H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large"); - -#ifdef COALESCE_READS - /* Get the dataset transfer property list */ - if (H5P_DEFAULT == dxpl_id) { - xfer_parms = &H5F_xfer_dflt; - } else if (H5P_DATASET_XFER != H5P_get_class (dxpl_id) || - NULL == (xfer_parms = H5I_object (dxpl_id))) { - HRETURN_ERROR (H5E_PLIST, H5E_BADTYPE, FAIL, "not a xfer"); - } - - if (xfer_parms->gather_reads) { - if (! count) - count = xfer_parms->gather_reads; -#ifdef DEBUG - fprintf (stdout, "H5FD_dpss_read: request would be queued\n"); -#endif - } else { -#ifdef DEBUG - fprintf (stdout, "H5FD_dpss_read: transaction would be performed " - "with %d individual reads\n", count + 1); -#endif - count = 0; - } -#endif - - /* do the (synchronuous) write operation */ - globus_result = grid_storage_read (&file->handle, (unsigned char *) buf, - (size_t) addr, (size_t) size, NULL); - if (GLOBUS_SUCCESS != globus_result) { - PRINT_GLOBUS_ERROR_MSG (globus_result); - HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL, - "Failed to read file instance"); - } - - FUNC_LEAVE (SUCCEED); -} - -/*------------------------------------------------------------------------- - * Function: H5FD_dpss_write - * - * Purpose: Writes SIZE bytes of data to FILE beginning at address ADDR - * from buffer BUF. - * - * Return: Success: Zero - * - * Failure: -1 - * - * Programmer: Thomas Radke - * Monday, October 11, 1999 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_dpss_write (H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t addr, - hsize_t size, const void *buf) -{ - H5FD_dpss_t *file = (H5FD_dpss_t *) _file; - globus_result_t globus_result; - - FUNC_ENTER (H5FD_dpss_write, FAIL); - -#ifdef DEBUG - fprintf (stdout, "H5FD_dpss_write: addr 0x%lx, size %ld\n", - (unsigned long int) addr, (unsigned long int) size); -#endif - - /* Check parameters */ - if (! file) - HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle"); - if (! buf) - HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer pointer"); - - /* Check for overflow conditions */ - if (HADDR_UNDEF == addr) - HRETURN_ERROR (H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined"); - if (REGION_OVERFLOW (addr, size)) - HRETURN_ERROR (H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large"); - if (addr + size > file->eoa) - HRETURN_ERROR (H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large"); - - /* do the (synchronuous) write operation */ - globus_result = grid_storage_write (&file->handle, (unsigned char *) buf, - (size_t) addr, (size_t) size, NULL); - if (GLOBUS_SUCCESS != globus_result) { - PRINT_GLOBUS_ERROR_MSG (globus_result); - HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, - "Failed to write file instance"); - } - - /* expand end-of-file marker if necessary */ - if (addr > file->eof) - file->eof = addr; - - FUNC_LEAVE (SUCCEED); -} - -#endif /* DPSS */ - diff --git a/src/H5FDdpss.h b/src/H5FDdpss.h deleted file mode 100644 index e67df30..0000000 --- a/src/H5FDdpss.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright © 1999 NCSA - * All rights reserved. - * - * Programmer: Thomas Radke <tradke@aei-potsdam.mpg.de> - * Monday, October 11, 1999 - * - * Purpose: The public header file for the DPSS driver. - */ -#ifndef H5FDdpss_H -#define H5FDdpss_H - -#include "H5public.h" /* typedef for herr_t */ -#include "H5Ipublic.h" /* typedef for hid_t */ - -#ifdef H5_HAVE_GRIDSTORAGE -#define H5FD_DPSS (H5FD_dpss_init()) -#else -#define H5FD_DPSS (-1) -#endif - -/* Function prototypes */ -#ifdef H5_HAVE_GRIDSTORAGE - -#ifdef __cplusplus -extern "C" { -#endif - -hid_t H5FD_dpss_init(void); -herr_t H5Pset_fapl_dpss (hid_t fapl_id); -herr_t H5Pget_fapl_dpss (hid_t fapl_id); - -#ifdef __cplusplus -} -#endif - -#endif - -#endif /* H5FDdpss_H */ @@ -35,7 +35,6 @@ #include "H5FDstdio.h" /* Standard C buffered I/O */ #include "H5FDsrb.h" /* Remote access using SRB */ #include "H5FDgass.h" /* Remote files using GASS I/O */ -#include "H5FDdpss.h" /* Remote access using Storage Client API */ #include "H5FDstream.h" /* in-memory files streamed via sockets */ #include "H5FDmulti.h" /* Usage-partitioned file family */ #include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ diff --git a/src/H5config.h.in b/src/H5config.h.in index d61f9e3..0d85ab9 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -86,9 +86,6 @@ /* Define if the SRB is defined */ #undef HAVE_SRB -/* Define if the Grid Storage is defined */ -#undef HAVE_GRIDSTORAGE - /* Define if the stream virtual file driver should be compiled */ #undef HAVE_STREAM @@ -281,9 +278,6 @@ /* Define if you have the <globus_common.h> header file. */ #undef HAVE_GLOBUS_COMMON_H -/* Define if you have the <grid_storage_file.h> header file. */ -#undef HAVE_GRID_STORAGE_FILE_H - /* Define if you have the <io.h> header file. */ #undef HAVE_IO_H @@ -389,12 +383,6 @@ /* Define if you have the globus_io library (-lglobus_io). */ #undef HAVE_LIBGLOBUS_IO -/* Define if you have the grid_storage_client library (-lgrid_storage_client). */ -#undef HAVE_LIBGRID_STORAGE_CLIENT - -/* Define if you have the grid_storage_file library (-lgrid_storage_file). */ -#undef HAVE_LIBGRID_STORAGE_FILE - /* Define if you have the jpeg library (-ljpeg). */ #undef HAVE_LIBJPEG diff --git a/src/Makefile.in b/src/Makefile.in index cc1eb64..4d3774b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -21,7 +21,7 @@ CLEAN=libhdf5.settings ## Source and object files for the library (lexicographically)... LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcontig.c \ H5Fistore.c H5Fseq.c H5FD.c H5FDsec2.c H5FDfamily.c H5FDmpio.c H5FDcore.c \ - H5FDdpss.c H5FDmulti.c H5FDgass.c H5FDlog.c H5FDsrb.c H5FDstdio.c \ + H5FDmulti.c H5FDgass.c H5FDlog.c H5FDsrb.c H5FDstdio.c \ H5FDstream.c H5FL.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c \ H5MF.c H5MM.c H5O.c H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c \ H5Ofill.c H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c H5Osdspace.c \ @@ -37,7 +37,7 @@ MOSTLYCLEAN=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c ## Public header files (to be installed)... PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h H5Epublic.h \ - H5Fpublic.h H5FDpublic.h H5FDdpss.h H5FDfamily.h H5FDgass.h H5FDmpio.h \ + H5Fpublic.h H5FDpublic.h H5FDfamily.h H5FDgass.h H5FDmpio.h \ H5FDlog.h H5FDsec2.h H5FDsrb.h H5FDstream.h H5FDcore.h H5FDmulti.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 \ @@ -46,7 +46,6 @@ #include "H5FDstdio.h" /* Standard C buffered I/O */ #include "H5FDsrb.h" /* Remote access using SRB */ #include "H5FDgass.h" /* Remote files using GASS I/O */ -#include "H5FDdpss.h" /* Remote access using Storage Client API */ #include "H5FDstream.h" /* in-memory files streamed via sockets */ #include "H5FDmulti.h" /* Usage-partitioned file family */ #include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ diff --git a/test/Dependencies b/test/Dependencies index 0de0e44..975ca06 100644 --- a/test/Dependencies +++ b/test/Dependencies @@ -33,7 +33,6 @@ h5test.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -83,7 +82,6 @@ big.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -133,7 +131,6 @@ bittests.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -183,7 +180,6 @@ cmpd_dset.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -233,7 +229,6 @@ dsets.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -283,7 +278,6 @@ dtypes.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -333,7 +327,6 @@ extend.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -383,7 +376,6 @@ external.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -433,7 +425,6 @@ fillval.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -483,7 +474,6 @@ flush1.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -533,7 +523,6 @@ flush2.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -583,7 +572,6 @@ gheap.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -646,7 +634,6 @@ istore.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -701,7 +688,6 @@ lheap.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -753,7 +739,6 @@ links.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -803,7 +788,6 @@ mount.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -853,7 +837,6 @@ mtime.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -903,7 +886,6 @@ ohdr.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -955,7 +937,6 @@ stab.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1009,7 +990,6 @@ tarray.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1048,10 +1028,47 @@ tattr.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h +tconfig.lo: \ + $(srcdir)/tconfig.c \ + $(top_srcdir)/src/hdf5.h \ + $(top_srcdir)/src/H5public.h \ + $(top_builddir)/src/H5pubconf.h \ + $(top_srcdir)/src/H5api_adpt.h \ + $(top_srcdir)/src/H5Ipublic.h \ + $(top_srcdir)/src/H5Apublic.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/H5HGpublic.h \ + $(top_srcdir)/src/H5HLpublic.h \ + $(top_srcdir)/src/H5MMpublic.h \ + $(top_srcdir)/src/H5Opublic.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/H5FDmpio.h \ + $(top_srcdir)/src/H5FDsec2.h \ + $(top_srcdir)/src/H5FDstdio.h \ + $(top_srcdir)/src/H5FDsrb.h \ + $(top_srcdir)/src/H5FDgass.h \ + $(top_srcdir)/src/H5FDstream.h \ + $(top_srcdir)/src/H5FDmulti.h \ + $(top_srcdir)/src/H5FDlog.h \ + $(top_srcdir)/src/H5private.h \ + $(top_builddir)/src/H5config.h \ + $(srcdir)/testhdf5.h \ + $(top_srcdir)/src/H5Eprivate.h testhdf5.lo: \ $(srcdir)/testhdf5.c \ $(srcdir)/testhdf5.h \ @@ -1094,7 +1111,6 @@ testmeta.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1170,7 +1186,6 @@ tgenprop.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1246,7 +1261,6 @@ titerate.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1299,7 +1313,6 @@ trefer.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1338,7 +1351,6 @@ tselect.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1377,7 +1389,6 @@ ttime.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1428,7 +1439,6 @@ tvltypes.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1467,7 +1477,6 @@ tvlstr.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -1503,7 +1512,6 @@ unlink.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1553,7 +1561,6 @@ enum.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1605,7 +1612,6 @@ ttsafe_dcreate.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1644,7 +1650,6 @@ ttsafe_error.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1683,7 +1688,6 @@ ttsafe_cancel.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1722,7 +1726,6 @@ ttsafe_acreate.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1761,7 +1764,6 @@ gass_write.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1811,7 +1813,6 @@ gass_read.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -1861,107 +1862,6 @@ gass_append.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ - $(top_srcdir)/src/H5FDstream.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5private.h \ - $(top_builddir)/src/H5config.h \ - $(top_srcdir)/src/H5Tpkg.h \ - $(top_srcdir)/src/H5HGprivate.h \ - $(top_srcdir)/src/H5Fprivate.h \ - $(top_srcdir)/src/H5Dprivate.h \ - $(top_srcdir)/src/H5Gprivate.h \ - $(top_srcdir)/src/H5Bprivate.h \ - $(top_srcdir)/src/H5ACprivate.h \ - $(top_srcdir)/src/H5Oprivate.h \ - $(top_srcdir)/src/H5Tprivate.h \ - $(top_srcdir)/src/H5Rprivate.h \ - $(top_srcdir)/src/H5Zprivate.h \ - $(top_srcdir)/src/H5Sprivate.h -dpss_read.lo: \ - $(srcdir)/dpss_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/H5Ipublic.h \ - $(top_srcdir)/src/H5Apublic.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/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Opublic.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/H5FDmpio.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ - $(top_srcdir)/src/H5FDstream.h \ - $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDlog.h \ - $(top_srcdir)/src/H5private.h \ - $(top_builddir)/src/H5config.h \ - $(top_srcdir)/src/H5Tpkg.h \ - $(top_srcdir)/src/H5HGprivate.h \ - $(top_srcdir)/src/H5Fprivate.h \ - $(top_srcdir)/src/H5Dprivate.h \ - $(top_srcdir)/src/H5Gprivate.h \ - $(top_srcdir)/src/H5Bprivate.h \ - $(top_srcdir)/src/H5ACprivate.h \ - $(top_srcdir)/src/H5Oprivate.h \ - $(top_srcdir)/src/H5Tprivate.h \ - $(top_srcdir)/src/H5Rprivate.h \ - $(top_srcdir)/src/H5Zprivate.h \ - $(top_srcdir)/src/H5Sprivate.h -dpss_write.lo: \ - $(srcdir)/dpss_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/H5Ipublic.h \ - $(top_srcdir)/src/H5Apublic.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/H5HGpublic.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Opublic.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/H5FDmpio.h \ - $(top_srcdir)/src/H5FDsec2.h \ - $(top_srcdir)/src/H5FDstdio.h \ - $(top_srcdir)/src/H5FDsrb.h \ - $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -2011,7 +1911,6 @@ srb_read.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -2061,7 +1960,6 @@ srb_write.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -2111,7 +2009,6 @@ srb_append.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -2160,7 +2057,6 @@ stream_test.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h diff --git a/test/Makefile.in b/test/Makefile.in index 15fdb4b..7d4383f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -19,8 +19,8 @@ RUNTEST=$(LT_RUN) TEST_PROGS=testhdf5 lheap ohdr stab gheap hyperslab istore bittests dtypes \ dsets cmpd_dset extend external links unlink big mtime fillval mount \ - flush1 flush2 enum gass_write gass_read gass_append dpss_write \ - dpss_read srb_write srb_append srb_read ttsafe stream_test + flush1 flush2 enum gass_write gass_read gass_append \ + srb_write srb_append srb_read ttsafe stream_test TIMINGS=testmeta @@ -62,8 +62,8 @@ TEST_SRC=big.c bittests.c cmpd_dset.c dsets.c dtypes.c extend.c \ tattr.c tconfig.c testhdf5.c testmeta.c tfile.c tgenprop.c th5s.c \ titerate.c tmeta.c trefer.c tselect.c ttime.c ttbbt.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 dpss_read.c \ - dpss_write.c srb_read.c srb_write.c srb_append.c stream_test.c + ttsafe_acreate.c gass_write.c gass_read.c gass_append.c \ + srb_read.c srb_write.c srb_append.c stream_test.c TEST_OBJ=$(TEST_SRC:.c=.lo) @@ -168,12 +168,6 @@ gass_read: gass_read.lo gass_append: gass_append.lo @$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) -dpss_read: dpss_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ dpss_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - -dpss_write: dpss_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ dpss_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) - srb_read: srb_read.lo @$(LT_LINK_EXE) $(CFLAGS) -o $@ srb_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) diff --git a/test/dpss_read.c b/test/dpss_read.c deleted file mode 100644 index 263aac6..0000000 --- a/test/dpss_read.c +++ /dev/null @@ -1,187 +0,0 @@ -/* - * Copyright © 1998 NCSA - * All rights reserved. - * - * 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 DPSS driver. - 1. Open a remote file for read (the dataset was written using dpss_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 <strings.h> - -#ifndef H5_HAVE_GRIDSTORAGE -int main(void) -{ - printf("Test skipped because DPSS driver not available\n"); - return 0; -} -#else - -#define DATASETNAME "IntArray" -#define NX_SUB 98 /* hyperslab dimensions */ -#define NY_SUB 98 -#define NX 100 /* output buffer dimensions */ -#define NY 100 -#define NZ 3 -#define RANK 2 -#define RANK_OUT 3 - -int -main (int argc, char **argv) -{ - hid_t fapl = -1, file, dataset; /* handles */ - 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; - char *url; - - if (argc != 2) { - printf ("Incorrect command line. \n"); - printf ("Correct command line: %s <url>\n\n", argv[0]); - exit(1); - } - - url = argv [1]; - - 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 DPSS */ - fapl = H5Pcreate (H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - - status = H5Pset_fapl_dpss (fapl); - if (status < 0) { - printf ("H5Pset_fapl_dpss failed. \n"); - return -1; - } - - /* - * Open the file and the dataset. - */ - file = H5Fopen(url, H5F_ACC_RDONLY, fapl); - if (file < 0) { - printf ("Could not open file '%s'\n", url); - return -1; - } - 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] = 0; - offset[1] = 0; - 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); -#if 0 - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) printf("%d ", data_out[j][i][0]); - printf("\n"); - } -#endif - /* - * 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/dpss_write.c b/test/dpss_write.c deleted file mode 100644 index c60b0eb..0000000 --- a/test/dpss_write.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright © 1998 NCSA - * All rights reserved. - * - * Programmer: Saurabh Bagchi (bagchi@uiuc.edu) - * Friday, August 6, 1999. - * - * Modifications: Thomas Radke (tradke@aei-potsdam.mpg.de) - * Modified to work with DPSS Virtual File Driver. - */ - -/* Test the following functionality of the DPSS 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_GRIDSTORAGE -int main(void) -{ - printf("Test skipped because DPSS driver not available\n"); - return 0; -} -#else - -#define DATASETNAME "IntArray" -#define NX 100 /* dataset dimensions */ -#define NY 100 -#define RANK 2 - -int main (int argc, char **argv) -{ - - 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; - - if (argc != 2) { - fprintf (stderr, "Usage: %s <URL>\n", argv [0]); - exit (0); - } - - /* - * 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 DPSS */ - fapl = H5Pcreate (H5P_FILE_ACCESS); - if (fapl < 0) { - printf (" H5Pcreate failed. \n"); - return -1; - } - - status = H5Pset_fapl_dpss (fapl); - if (status < 0) { - printf ("H5Pset_fapl_dpss failed. \n"); - return -1; - } - - /* - * Create a new file using H5F_ACC_TRUNC access, - * default file creation properties, and DPSS file - * access properties. - */ - file = H5Fcreate(argv [1], H5F_ACC_TRUNC, H5P_DEFAULT, fapl); - if (file < 0) { - printf ("Failed to create file instance '%s'\n", argv [1]); - 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; -} -#endif - diff --git a/tools/gifconv/Dependencies b/tools/gifconv/Dependencies index 4730190..4084ded 100644 --- a/tools/gifconv/Dependencies +++ b/tools/gifconv/Dependencies @@ -33,7 +33,6 @@ decompress.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -69,7 +68,6 @@ gif2hdf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -105,7 +103,6 @@ gif2mem.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -141,7 +138,6 @@ gifread.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -177,7 +173,6 @@ hdf2gif.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -213,7 +208,6 @@ hdfgifwr.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -249,7 +243,6 @@ readhdf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -285,7 +278,6 @@ writehdf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h diff --git a/tools/h4toh5/Dependencies b/tools/h4toh5/Dependencies index 56af893..f20a939 100644 --- a/tools/h4toh5/Dependencies +++ b/tools/h4toh5/Dependencies @@ -35,7 +35,6 @@ h4toh5main.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -72,7 +71,6 @@ h4toh5vgroup.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -109,7 +107,6 @@ h4toh5vdata.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -146,7 +143,6 @@ h4toh5sds.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -183,7 +179,6 @@ h4toh5image.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -220,7 +215,6 @@ h4toh5pal.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -257,7 +251,6 @@ h4toh5anno.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -294,7 +287,6 @@ h4toh5util.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h diff --git a/tools/h5dump/Dependencies b/tools/h5dump/Dependencies index aeb59ae..e1384f3 100644 --- a/tools/h5dump/Dependencies +++ b/tools/h5dump/Dependencies @@ -33,7 +33,6 @@ h5dump.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -72,7 +71,6 @@ h5dumptst.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ diff --git a/tools/h5ls/Dependencies b/tools/h5ls/Dependencies index 58bb3c9..a908f5f 100644 --- a/tools/h5ls/Dependencies +++ b/tools/h5ls/Dependencies @@ -35,7 +35,7 @@ h5ls.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ - $(top_srcdir)/src/H5FDlog.h + $(top_srcdir)/src/H5FDlog.h \ + $(top_srcdir)/tools/lib/h5tools_utils.h diff --git a/tools/h5toh4/Dependencies b/tools/h5toh4/Dependencies index d270e25..3ad4e15 100644 --- a/tools/h5toh4/Dependencies +++ b/tools/h5toh4/Dependencies @@ -33,7 +33,6 @@ h5toh4.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ diff --git a/tools/lib/Dependencies b/tools/lib/Dependencies index 808759b..02f6e05 100644 --- a/tools/lib/Dependencies +++ b/tools/lib/Dependencies @@ -33,7 +33,6 @@ h5tools.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -75,7 +74,6 @@ h5tools_str.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -112,7 +110,6 @@ h5tools_utils.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ @@ -149,7 +146,6 @@ talign.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h \ diff --git a/tools/misc/Dependencies b/tools/misc/Dependencies index 54271bd..2ff6184 100644 --- a/tools/misc/Dependencies +++ b/tools/misc/Dependencies @@ -71,7 +71,6 @@ h5import.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -106,7 +105,6 @@ h5repart.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h @@ -141,7 +139,6 @@ pdb2hdf.lo: \ $(top_srcdir)/src/H5FDstdio.h \ $(top_srcdir)/src/H5FDsrb.h \ $(top_srcdir)/src/H5FDgass.h \ - $(top_srcdir)/src/H5FDdpss.h \ $(top_srcdir)/src/H5FDstream.h \ $(top_srcdir)/src/H5FDmulti.h \ $(top_srcdir)/src/H5FDlog.h |