summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2001-12-30 05:23:38 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2001-12-30 05:23:38 (GMT)
commite22c09563636a72fbf6600685fcb14df6e069436 (patch)
tree6feecaaebc3cf8de207f5d74864d8b7bca6eb69b
parentbb0692aff25e35793dccf071a752f5b7faf1ae9a (diff)
downloadhdf5-e22c09563636a72fbf6600685fcb14df6e069436.zip
hdf5-e22c09563636a72fbf6600685fcb14df6e069436.tar.gz
hdf5-e22c09563636a72fbf6600685fcb14df6e069436.tar.bz2
[svn-r4757] Purpose:
Removing the DPSS (gridstorage) driver source code. 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, arabica (fortran, cxx).
-rw-r--r--MANIFEST4
-rw-r--r--acconfig.h3
-rwxr-xr-xconfigure1511
-rw-r--r--configure.in69
-rw-r--r--examples/Dependencies44
-rw-r--r--fortran/src/Dependencies13
-rw-r--r--pablo/Makefile.in3
-rw-r--r--perform/Dependencies116
-rw-r--r--src/Dependencies419
-rw-r--r--src/H5F.c4
-rw-r--r--src/H5FDdpss.c677
-rw-r--r--src/H5FDdpss.h39
-rw-r--r--src/Makefile.in4
-rw-r--r--src/hdf5.h1
-rw-r--r--test/Dependencies237
-rw-r--r--test/Makefile.in14
-rw-r--r--test/dpss_read.c187
-rw-r--r--test/dpss_write.c149
-rw-r--r--tools/gifconv/Dependencies8
-rw-r--r--tools/h4toh5/Dependencies8
-rw-r--r--tools/h5dump/Dependencies2
-rw-r--r--tools/h5ls/Dependencies1
-rw-r--r--tools/h5toh4/Dependencies1
-rw-r--r--tools/lib/Dependencies4
-rw-r--r--tools/misc/Dependencies1
25 files changed, 814 insertions, 2705 deletions
diff --git a/MANIFEST b/MANIFEST
index ff588b7..6266df5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -798,8 +798,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
@@ -906,8 +904,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
diff --git a/acconfig.h b/acconfig.h
index 0141235..23441b3 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -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
diff --git a/configure b/configure
index 8a3c2eb..7e85a82 100755
--- a/configure
+++ b/configure
@@ -158,8 +158,6 @@ ac_help="$ac_help
ac_help="$ac_help
--with-gass[=DIR] Use the GASS library [default=no]"
ac_help="$ac_help
- --with-gridstorage[=DIR] Use the Globus Grid Storage driver [default=no]"
-ac_help="$ac_help
--with-srb[=DIR] Use the SRB library [default=no]"
ac_help="$ac_help
--with-pthread[=DIR] Use the Pthreads library [default=no]"
@@ -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
@@ -796,7 +794,7 @@ fi
echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6
-echo "configure:800: checking for sizeof hsize_t and hssize_t" >&5
+echo "configure:798: checking for sizeof hsize_t and hssize_t" >&5
case $HSIZET in
@@ -827,7 +825,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:831: checking for config $f" >&5
+echo "configure:829: checking for config $f" >&5
if test -f "$srcdir/config/$f"; then
host_config=$srcdir/config/$f
echo "$ac_t""found" 1>&6
@@ -844,7 +842,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:848: checking for config $file" >&5
+echo "configure:846: checking for config $file" >&5
if test -f "$file"; then
. $file
echo "$ac_t""found" 1>&6
@@ -859,7 +857,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:863: checking for $ac_word" >&5
+echo "configure:861: 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
@@ -889,7 +887,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:893: checking for $ac_word" >&5
+echo "configure:891: 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
@@ -940,7 +938,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:944: checking for $ac_word" >&5
+echo "configure:942: 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
@@ -972,7 +970,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:976: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:974: 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.
@@ -983,12 +981,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 987 "configure"
+#line 985 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:990: \"$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
@@ -1014,12 +1012,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:1018: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1016: 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:1023: checking whether we are using GNU C" >&5
+echo "configure:1021: 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
@@ -1028,7 +1026,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1032: \"$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:1030: \"$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
@@ -1047,7 +1045,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:1051: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1049: 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
@@ -1083,7 +1081,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:1087: checking if fortran interface enabled" >&5
+echo "configure:1085: 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"
@@ -1103,7 +1101,7 @@ else
fi
echo $ac_n "checking if c++ interface enabled""... $ac_c" 1>&6
-echo "configure:1107: checking if c++ interface enabled" >&5
+echo "configure:1105: 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"
@@ -1126,7 +1124,7 @@ subdirs="${config_dirs}"
echo $ac_n "checking if should build only statically linked executables""... $ac_c" 1>&6
-echo "configure:1130: checking if should build only statically linked executables" >&5
+echo "configure:1128: 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"
@@ -1150,7 +1148,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:1154: checking for $ac_word" >&5
+echo "configure:1152: 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
@@ -1187,7 +1185,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:1191: checking for $ac_word" >&5
+echo "configure:1189: 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
@@ -1223,7 +1221,7 @@ fi
export AR
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1227: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1225: 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
@@ -1261,7 +1259,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:1265: checking for a BSD compatible install" >&5
+echo "configure:1263: 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
@@ -1384,7 +1382,7 @@ else
fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1388: checking build system type" >&5
+echo "configure:1386: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1404,7 +1402,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:1408: checking for $ac_word" >&5
+echo "configure:1406: 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
@@ -1443,7 +1441,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:1447: checking for ld used by GCC" >&5
+echo "configure:1445: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@@ -1467,10 +1465,10 @@ echo "configure:1447: 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:1471: checking for GNU ld" >&5
+echo "configure:1469: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1474: checking for non-GNU ld" >&5
+echo "configure:1472: 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
@@ -1505,7 +1503,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:1509: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1507: 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
@@ -1521,7 +1519,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:1525: checking for BSD-compatible nm" >&5
+echo "configure:1523: 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
@@ -1557,7 +1555,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:1561: checking whether ln -s works" >&5
+echo "configure:1559: 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
@@ -1606,8 +1604,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
case "$lt_target" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 1610 "configure"' > conftest.$ac_ext
- if { (eval echo configure:1611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 1608 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:1609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
LD="${LD-ld} -32"
@@ -1628,19 +1626,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:1632: checking whether the C compiler needs -belf" >&5
+echo "configure:1630: 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 1637 "configure"
+#line 1635 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1642: \"$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
@@ -1749,7 +1747,7 @@ case "$INSTALL" in
esac
echo $ac_n "checking make""... $ac_c" 1>&6
-echo "configure:1753: checking make" >&5
+echo "configure:1751: checking make" >&5
if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
sed -n 1p|cut -c1-8`" = "GNU Make"; then
@@ -1766,7 +1764,7 @@ fi
if test -z "$DEPEND"; then
echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6
-echo "configure:1770: checking how to include a makefile" >&5
+echo "configure:1768: checking how to include a makefile" >&5
cat >makeinc <<EOF
foo:
@@ -1796,7 +1794,7 @@ EOF
fi
echo $ac_n "checking how make searches directories""... $ac_c" 1>&6
-echo "configure:1800: checking how make searches directories" >&5
+echo "configure:1798: checking how make searches directories" >&5
while true; do #for break
# The most common method is `VPATH=DIR1 DIR2 ...'
cat >maketest <<EOF
@@ -1861,7 +1859,7 @@ done
rm maketest
echo $ac_n "checking for production mode""... $ac_c" 1>&6
-echo "configure:1865: checking for production mode" >&5
+echo "configure:1863: checking for production mode" >&5
# Check whether --enable-production or --disable-production was given.
if test "${enable_production+set}" = set; then
enableval="$enable_production"
@@ -1895,7 +1893,7 @@ case "X-$enable_production" in
esac
echo $ac_n "checking for ceil in -lm""... $ac_c" 1>&6
-echo "configure:1899: checking for ceil in -lm" >&5
+echo "configure:1897: 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
@@ -1903,7 +1901,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1907 "configure"
+#line 1905 "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
@@ -1914,7 +1912,7 @@ int main() {
ceil()
; return 0; }
EOF
-if { (eval echo configure:1918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1916: \"$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
@@ -1944,7 +1942,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:1948: checking for xdr_int in -lnsl" >&5
+echo "configure:1946: 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
@@ -1952,7 +1950,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1956 "configure"
+#line 1954 "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
@@ -1963,7 +1961,7 @@ int main() {
xdr_int()
; return 0; }
EOF
-if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1965: \"$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
@@ -1994,7 +1992,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1998: checking how to run the C preprocessor" >&5
+echo "configure:1996: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -2009,13 +2007,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 2013 "configure"
+#line 2011 "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:2019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2017: \"$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
:
@@ -2026,13 +2024,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2030 "configure"
+#line 2028 "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:2036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2034: \"$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
:
@@ -2043,13 +2041,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2047 "configure"
+#line 2045 "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:2053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2051: \"$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
:
@@ -2074,12 +2072,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2078: checking for ANSI C header files" >&5
+echo "configure:2076: 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 2083 "configure"
+#line 2081 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2087,7 +2085,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2089: \"$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*
@@ -2104,7 +2102,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 2108 "configure"
+#line 2106 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2122,7 +2120,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 2126 "configure"
+#line 2124 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2143,7 +2141,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2147 "configure"
+#line 2145 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2154,7 +2152,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2178,12 +2176,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2182: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2180: 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 2187 "configure"
+#line 2185 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -2192,7 +2190,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:2196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -2216,17 +2214,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:2220: checking for $ac_hdr" >&5
+echo "configure:2218: 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 2225 "configure"
+#line 2223 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2228: \"$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*
@@ -2256,17 +2254,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:2260: checking for $ac_hdr" >&5
+echo "configure:2258: 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 2265 "configure"
+#line 2263 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2268: \"$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*
@@ -2296,17 +2294,17 @@ for ac_hdr in stddef.h setjmp.h features.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2300: checking for $ac_hdr" >&5
+echo "configure:2298: 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 2305 "configure"
+#line 2303 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2308: \"$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*
@@ -2336,17 +2334,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:2340: checking for $ac_hdr" >&5
+echo "configure:2338: 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 2345 "configure"
+#line 2343 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2348: \"$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*
@@ -2376,17 +2374,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:2380: checking for $ac_hdr" >&5
+echo "configure:2378: 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 2385 "configure"
+#line 2383 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2388: \"$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*
@@ -2419,17 +2417,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:2423: checking for $ac_hdr" >&5
+echo "configure:2421: 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 2428 "configure"
+#line 2426 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2431: \"$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*
@@ -2479,12 +2477,12 @@ fi
for ac_func in getdents64
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2483: checking for $ac_func" >&5
+echo "configure:2481: 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 2488 "configure"
+#line 2486 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2507,7 +2505,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2509: \"$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
@@ -2535,7 +2533,7 @@ done
esac
echo $ac_n "checking for large file support on linux mode""... $ac_c" 1>&6
-echo "configure:2539: checking for large file support on linux mode" >&5
+echo "configure:2537: checking for large file support on linux mode" >&5
if test "X$LINUX_LFS" = "Xyes"; then
echo "$ac_t""enabled" 1>&6
@@ -2551,24 +2549,24 @@ echo "configure:2539: checking for large file support on linux mode" >&5
esac
cat > conftest.$ac_ext <<EOF
-#line 2555 "configure"
+#line 2553 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
off64_t n = 0;
; return 0; }
EOF
-if { (eval echo configure:2562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2560: \"$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:2567: checking for $ac_func" >&5
+echo "configure:2565: 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 2572 "configure"
+#line 2570 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2591,7 +2589,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2593: \"$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
@@ -2624,12 +2622,12 @@ fi
rm -f conftest*
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2628: checking for off_t" >&5
+echo "configure:2626: 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 2633 "configure"
+#line 2631 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2657,12 +2655,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2661: checking for size_t" >&5
+echo "configure:2659: 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 2666 "configure"
+#line 2664 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2690,12 +2688,12 @@ EOF
fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:2694: checking for ssize_t" >&5
+echo "configure:2692: 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 2699 "configure"
+#line 2697 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2723,14 +2721,14 @@ EOF
fi
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2727: checking whether byte ordering is bigendian" >&5
+echo "configure:2725: 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 2734 "configure"
+#line 2732 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2741,11 +2739,11 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:2745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2743: \"$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 2749 "configure"
+#line 2747 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2756,7 +2754,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:2760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -2776,7 +2774,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 2780 "configure"
+#line 2778 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -2789,7 +2787,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:2793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2791: \"$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
@@ -2813,7 +2811,7 @@ EOF
fi
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:2817: checking size of char" >&5
+echo "configure:2815: 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
@@ -2821,7 +2819,7 @@ else
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 2825 "configure"
+#line 2823 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2832,7 +2830,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2834: \"$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
@@ -2852,7 +2850,7 @@ EOF
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2856: checking size of short" >&5
+echo "configure:2854: 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
@@ -2860,7 +2858,7 @@ else
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 2864 "configure"
+#line 2862 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2871,7 +2869,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2873: \"$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
@@ -2891,7 +2889,7 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2895: checking size of int" >&5
+echo "configure:2893: 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
@@ -2899,7 +2897,7 @@ else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 2903 "configure"
+#line 2901 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2910,7 +2908,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2912: \"$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
@@ -2930,7 +2928,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2934: checking size of long" >&5
+echo "configure:2932: 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
@@ -2938,7 +2936,7 @@ else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 2942 "configure"
+#line 2940 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2949,7 +2947,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2951: \"$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
@@ -2969,7 +2967,7 @@ EOF
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:2973: checking size of long long" >&5
+echo "configure:2971: 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
@@ -2977,7 +2975,7 @@ else
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 2981 "configure"
+#line 2979 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2988,7 +2986,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2990: \"$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
@@ -3008,7 +3006,7 @@ EOF
echo $ac_n "checking size of __int64""... $ac_c" 1>&6
-echo "configure:3012: checking size of __int64" >&5
+echo "configure:3010: 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
@@ -3016,7 +3014,7 @@ else
ac_cv_sizeof___int64=8
else
cat > conftest.$ac_ext <<EOF
-#line 3020 "configure"
+#line 3018 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3027,7 +3025,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3029: \"$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
@@ -3047,7 +3045,7 @@ EOF
echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:3051: checking size of float" >&5
+echo "configure:3049: 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
@@ -3055,7 +3053,7 @@ else
ac_cv_sizeof_float=4
else
cat > conftest.$ac_ext <<EOF
-#line 3059 "configure"
+#line 3057 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3066,7 +3064,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3068: \"$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
@@ -3086,7 +3084,7 @@ EOF
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:3090: checking size of double" >&5
+echo "configure:3088: 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
@@ -3094,7 +3092,7 @@ else
ac_cv_sizeof_double=8
else
cat > conftest.$ac_ext <<EOF
-#line 3098 "configure"
+#line 3096 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3105,7 +3103,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3107: \"$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
@@ -3125,7 +3123,7 @@ EOF
echo $ac_n "checking size of long double""... $ac_c" 1>&6
-echo "configure:3129: checking size of long double" >&5
+echo "configure:3127: 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
@@ -3133,7 +3131,7 @@ else
ac_cv_sizeof_long_double=8
else
cat > conftest.$ac_ext <<EOF
-#line 3137 "configure"
+#line 3135 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3144,7 +3142,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3146: \"$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
@@ -3223,7 +3221,7 @@ EOF
fi
echo $ac_n "checking size of int8_t""... $ac_c" 1>&6
-echo "configure:3227: checking size of int8_t" >&5
+echo "configure:3225: 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
@@ -3231,7 +3229,7 @@ else
ac_cv_sizeof_int8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 3235 "configure"
+#line 3233 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3242,7 +3240,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3244: \"$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
@@ -3262,7 +3260,7 @@ EOF
echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6
-echo "configure:3266: checking size of uint8_t" >&5
+echo "configure:3264: 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
@@ -3270,7 +3268,7 @@ else
ac_cv_sizeof_uint8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 3274 "configure"
+#line 3272 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3281,7 +3279,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3283: \"$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
@@ -3301,7 +3299,7 @@ EOF
echo $ac_n "checking size of int_least8_t""... $ac_c" 1>&6
-echo "configure:3305: checking size of int_least8_t" >&5
+echo "configure:3303: 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
@@ -3309,7 +3307,7 @@ else
ac_cv_sizeof_int_least8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 3313 "configure"
+#line 3311 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3320,7 +3318,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3322: \"$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
@@ -3340,7 +3338,7 @@ EOF
echo $ac_n "checking size of uint_least8_t""... $ac_c" 1>&6
-echo "configure:3344: checking size of uint_least8_t" >&5
+echo "configure:3342: 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
@@ -3348,7 +3346,7 @@ else
ac_cv_sizeof_uint_least8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+#line 3350 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3359,7 +3357,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3361: \"$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
@@ -3379,7 +3377,7 @@ EOF
echo $ac_n "checking size of int_fast8_t""... $ac_c" 1>&6
-echo "configure:3383: checking size of int_fast8_t" >&5
+echo "configure:3381: 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
@@ -3387,7 +3385,7 @@ else
ac_cv_sizeof_int_fast8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 3391 "configure"
+#line 3389 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3398,7 +3396,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3400: \"$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
@@ -3418,7 +3416,7 @@ EOF
echo $ac_n "checking size of uint_fast8_t""... $ac_c" 1>&6
-echo "configure:3422: checking size of uint_fast8_t" >&5
+echo "configure:3420: 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
@@ -3426,7 +3424,7 @@ else
ac_cv_sizeof_uint_fast8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 3430 "configure"
+#line 3428 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3437,7 +3435,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3439: \"$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
@@ -3458,7 +3456,7 @@ EOF
echo $ac_n "checking size of int16_t""... $ac_c" 1>&6
-echo "configure:3462: checking size of int16_t" >&5
+echo "configure:3460: 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
@@ -3466,7 +3464,7 @@ else
ac_cv_sizeof_int16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 3470 "configure"
+#line 3468 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3477,7 +3475,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3479: \"$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
@@ -3497,7 +3495,7 @@ EOF
echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6
-echo "configure:3501: checking size of uint16_t" >&5
+echo "configure:3499: 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
@@ -3505,7 +3503,7 @@ else
ac_cv_sizeof_uint16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 3509 "configure"
+#line 3507 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3516,7 +3514,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3518: \"$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
@@ -3536,7 +3534,7 @@ EOF
echo $ac_n "checking size of int_least16_t""... $ac_c" 1>&6
-echo "configure:3540: checking size of int_least16_t" >&5
+echo "configure:3538: 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
@@ -3544,7 +3542,7 @@ else
ac_cv_sizeof_int_least16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 3548 "configure"
+#line 3546 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3555,7 +3553,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3557: \"$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
@@ -3575,7 +3573,7 @@ EOF
echo $ac_n "checking size of uint_least16_t""... $ac_c" 1>&6
-echo "configure:3579: checking size of uint_least16_t" >&5
+echo "configure:3577: 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
@@ -3583,7 +3581,7 @@ else
ac_cv_sizeof_uint_least16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 3587 "configure"
+#line 3585 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3594,7 +3592,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3596: \"$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
@@ -3614,7 +3612,7 @@ EOF
echo $ac_n "checking size of int_fast16_t""... $ac_c" 1>&6
-echo "configure:3618: checking size of int_fast16_t" >&5
+echo "configure:3616: 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
@@ -3622,7 +3620,7 @@ else
ac_cv_sizeof_int_fast16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 3626 "configure"
+#line 3624 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3633,7 +3631,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3635: \"$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
@@ -3653,7 +3651,7 @@ EOF
echo $ac_n "checking size of uint_fast16_t""... $ac_c" 1>&6
-echo "configure:3657: checking size of uint_fast16_t" >&5
+echo "configure:3655: 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
@@ -3661,7 +3659,7 @@ else
ac_cv_sizeof_uint_fast16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 3665 "configure"
+#line 3663 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3672,7 +3670,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3674: \"$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
@@ -3693,7 +3691,7 @@ EOF
echo $ac_n "checking size of int32_t""... $ac_c" 1>&6
-echo "configure:3697: checking size of int32_t" >&5
+echo "configure:3695: 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
@@ -3701,7 +3699,7 @@ else
ac_cv_sizeof_int32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 3705 "configure"
+#line 3703 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3712,7 +3710,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3714: \"$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
@@ -3732,7 +3730,7 @@ EOF
echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6
-echo "configure:3736: checking size of uint32_t" >&5
+echo "configure:3734: 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
@@ -3740,7 +3738,7 @@ else
ac_cv_sizeof_uint32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 3744 "configure"
+#line 3742 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3751,7 +3749,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3753: \"$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
@@ -3771,7 +3769,7 @@ EOF
echo $ac_n "checking size of int_least32_t""... $ac_c" 1>&6
-echo "configure:3775: checking size of int_least32_t" >&5
+echo "configure:3773: 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
@@ -3779,7 +3777,7 @@ else
ac_cv_sizeof_int_least32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 3783 "configure"
+#line 3781 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3790,7 +3788,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3792: \"$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
@@ -3810,7 +3808,7 @@ EOF
echo $ac_n "checking size of uint_least32_t""... $ac_c" 1>&6
-echo "configure:3814: checking size of uint_least32_t" >&5
+echo "configure:3812: 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
@@ -3818,7 +3816,7 @@ else
ac_cv_sizeof_uint_least32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 3822 "configure"
+#line 3820 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3829,7 +3827,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3831: \"$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
@@ -3849,7 +3847,7 @@ EOF
echo $ac_n "checking size of int_fast32_t""... $ac_c" 1>&6
-echo "configure:3853: checking size of int_fast32_t" >&5
+echo "configure:3851: 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
@@ -3857,7 +3855,7 @@ else
ac_cv_sizeof_int_fast32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 3861 "configure"
+#line 3859 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3868,7 +3866,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3870: \"$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
@@ -3888,7 +3886,7 @@ EOF
echo $ac_n "checking size of uint_fast32_t""... $ac_c" 1>&6
-echo "configure:3892: checking size of uint_fast32_t" >&5
+echo "configure:3890: 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
@@ -3896,7 +3894,7 @@ else
ac_cv_sizeof_uint_fast32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 3900 "configure"
+#line 3898 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3907,7 +3905,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3909: \"$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
@@ -3928,7 +3926,7 @@ EOF
echo $ac_n "checking size of int64_t""... $ac_c" 1>&6
-echo "configure:3932: checking size of int64_t" >&5
+echo "configure:3930: 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
@@ -3936,7 +3934,7 @@ else
ac_cv_sizeof_int64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 3940 "configure"
+#line 3938 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3947,7 +3945,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3949: \"$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
@@ -3967,7 +3965,7 @@ EOF
echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6
-echo "configure:3971: checking size of uint64_t" >&5
+echo "configure:3969: 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
@@ -3975,7 +3973,7 @@ else
ac_cv_sizeof_uint64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 3979 "configure"
+#line 3977 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3986,7 +3984,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3988: \"$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
@@ -4006,7 +4004,7 @@ EOF
echo $ac_n "checking size of int_least64_t""... $ac_c" 1>&6
-echo "configure:4010: checking size of int_least64_t" >&5
+echo "configure:4008: 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
@@ -4014,7 +4012,7 @@ else
ac_cv_sizeof_int_least64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 4018 "configure"
+#line 4016 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -4025,7 +4023,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4027: \"$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
@@ -4045,7 +4043,7 @@ EOF
echo $ac_n "checking size of uint_least64_t""... $ac_c" 1>&6
-echo "configure:4049: checking size of uint_least64_t" >&5
+echo "configure:4047: 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
@@ -4053,7 +4051,7 @@ else
ac_cv_sizeof_uint_least64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 4057 "configure"
+#line 4055 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -4064,7 +4062,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4066: \"$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
@@ -4084,7 +4082,7 @@ EOF
echo $ac_n "checking size of int_fast64_t""... $ac_c" 1>&6
-echo "configure:4088: checking size of int_fast64_t" >&5
+echo "configure:4086: 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
@@ -4092,7 +4090,7 @@ else
ac_cv_sizeof_int_fast64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 4096 "configure"
+#line 4094 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -4103,7 +4101,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:4107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4105: \"$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
@@ -4123,7 +4121,7 @@ EOF
echo $ac_n "checking size of uint_fast64_t""... $ac_c" 1>&6
-echo "configure:4127: checking size of uint_fast64_t" >&5
+echo "configure:4125: 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
@@ -4131,7 +4129,7 @@ else
ac_cv_sizeof_uint_fast64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 4135 "configure"
+#line 4133 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -4142,7 +4140,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4144: \"$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
@@ -4163,7 +4161,7 @@ EOF
echo $ac_n "checking size of size_t""... $ac_c" 1>&6
-echo "configure:4167: checking size of size_t" >&5
+echo "configure:4165: 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
@@ -4171,7 +4169,7 @@ else
ac_cv_sizeof_size_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 4175 "configure"
+#line 4173 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -4182,7 +4180,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:4186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4184: \"$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
@@ -4202,7 +4200,7 @@ EOF
echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6
-echo "configure:4206: checking size of ssize_t" >&5
+echo "configure:4204: 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
@@ -4210,7 +4208,7 @@ else
ac_cv_sizeof_ssize_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 4214 "configure"
+#line 4212 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -4221,7 +4219,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:4225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4223: \"$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
@@ -4244,7 +4242,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:4248: checking size of off_t" >&5
+echo "configure:4246: 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
@@ -4252,7 +4250,7 @@ else
ac_cv_sizeof_off_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 4256 "configure"
+#line 4254 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -4263,7 +4261,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4265: \"$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
@@ -4332,9 +4330,9 @@ rm -f confcache
echo $ac_n "checking if dev_t is scalar""... $ac_c" 1>&6
-echo "configure:4336: checking if dev_t is scalar" >&5
+echo "configure:4334: checking if dev_t is scalar" >&5
cat > conftest.$ac_ext <<EOF
-#line 4338 "configure"
+#line 4336 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
@@ -4345,7 +4343,7 @@ int main() {
dev_t d1, d2; if(d1==d2) return 0;
; return 0; }
EOF
-if { (eval echo configure:4349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define DEV_T_IS_SCALAR 1
@@ -4390,7 +4388,7 @@ case "$withval" in
yes)
failed="no"
echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
-echo "configure:4394: checking for compress2 in -lz" >&5
+echo "configure:4392: 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
@@ -4398,7 +4396,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4402 "configure"
+#line 4400 "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
@@ -4409,7 +4407,7 @@ int main() {
compress2()
; return 0; }
EOF
-if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4411: \"$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
@@ -4440,7 +4438,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:4444: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:4442: 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
@@ -4448,7 +4446,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4452 "configure"
+#line 4450 "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
@@ -4459,7 +4457,7 @@ int main() {
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:4463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4461: \"$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
@@ -4490,7 +4488,7 @@ fi
fi
if test "$failed" = "no"; then
echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6
-echo "configure:4494: checking for Hstartaccess in -ldf" >&5
+echo "configure:4492: 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
@@ -4498,7 +4496,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4502 "configure"
+#line 4500 "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
@@ -4509,7 +4507,7 @@ int main() {
Hstartaccess()
; return 0; }
EOF
-if { (eval echo configure:4513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4511: \"$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
@@ -4540,7 +4538,7 @@ fi
fi
if test "$failed" = "no"; then
echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6
-echo "configure:4544: checking for SDstart in -lmfhdf" >&5
+echo "configure:4542: 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
@@ -4548,7 +4546,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmfhdf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4552 "configure"
+#line 4550 "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
@@ -4559,7 +4557,7 @@ int main() {
SDstart()
; return 0; }
EOF
-if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4561: \"$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
@@ -4597,7 +4595,7 @@ fi
;;
no)
echo $ac_n "checking for HDF4""... $ac_c" 1>&6
-echo "configure:4601: checking for HDF4" >&5
+echo "configure:4599: checking for HDF4" >&5
echo "$ac_t""suppressed" 1>&6
unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5
;;
@@ -4626,17 +4624,17 @@ echo "configure:4601: 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:4630: checking for $ac_hdr" >&5
+echo "configure:4628: 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 4635 "configure"
+#line 4633 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4638: \"$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*
@@ -4670,7 +4668,7 @@ done
if test "$failed" = "no"; then
echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
-echo "configure:4674: checking for compress2 in -lz" >&5
+echo "configure:4672: 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
@@ -4678,7 +4676,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4682 "configure"
+#line 4680 "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
@@ -4689,7 +4687,7 @@ int main() {
compress2()
; return 0; }
EOF
-if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4691: \"$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
@@ -4720,7 +4718,7 @@ fi
fi
if test "$failed" = "no"; then
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:4724: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:4722: 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
@@ -4728,7 +4726,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4732 "configure"
+#line 4730 "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
@@ -4739,7 +4737,7 @@ int main() {
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4741: \"$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
@@ -4771,7 +4769,7 @@ fi
fi
if test "$failed" = "no"; then
echo $ac_n "checking for Hstartaccess in -ldf""... $ac_c" 1>&6
-echo "configure:4775: checking for Hstartaccess in -ldf" >&5
+echo "configure:4773: 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
@@ -4779,7 +4777,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4783 "configure"
+#line 4781 "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
@@ -4790,7 +4788,7 @@ int main() {
Hstartaccess()
; return 0; }
EOF
-if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4792: \"$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
@@ -4821,7 +4819,7 @@ fi
fi
if test "$failed" = "no"; then
echo $ac_n "checking for SDstart in -lmfhdf""... $ac_c" 1>&6
-echo "configure:4825: checking for SDstart in -lmfhdf" >&5
+echo "configure:4823: 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
@@ -4829,7 +4827,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmfhdf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4833 "configure"
+#line 4831 "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
@@ -4840,7 +4838,7 @@ int main() {
SDstart()
; return 0; }
EOF
-if { (eval echo configure:4844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4842: \"$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
@@ -4896,17 +4894,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:4900: checking for $ac_hdr" >&5
+echo "configure:4898: 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 4905 "configure"
+#line 4903 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4908: \"$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*
@@ -4933,7 +4931,7 @@ fi
done
echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
-echo "configure:4937: checking for compress2 in -lz" >&5
+echo "configure:4935: 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
@@ -4941,7 +4939,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4945 "configure"
+#line 4943 "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
@@ -4952,7 +4950,7 @@ int main() {
compress2()
; return 0; }
EOF
-if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4954: \"$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
@@ -4984,7 +4982,7 @@ fi
no)
HAVE_ZLIB="no"
echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6
-echo "configure:4988: checking for GNU zlib" >&5
+echo "configure:4986: checking for GNU zlib" >&5
echo "$ac_t""suppressed" 1>&6
;;
*)
@@ -5013,17 +5011,17 @@ echo "configure:4988: 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:5017: checking for $ac_hdr" >&5
+echo "configure:5015: 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 5022 "configure"
+#line 5020 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5025: \"$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*
@@ -5056,7 +5054,7 @@ done
fi
echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
-echo "configure:5060: checking for compress2 in -lz" >&5
+echo "configure:5058: 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
@@ -5064,7 +5062,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5068 "configure"
+#line 5066 "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
@@ -5075,7 +5073,7 @@ int main() {
compress2()
; return 0; }
EOF
-if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5077: \"$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
@@ -5119,7 +5117,7 @@ fi
case "$withval" in
yes)
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:5123: checking for main in -lcrypto" >&5
+echo "configure:5121: 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
@@ -5127,14 +5125,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5131 "configure"
+#line 5129 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5136: \"$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
@@ -5163,7 +5161,7 @@ unset SSL
fi
echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6
-echo "configure:5167: checking for SSL_get_version in -lssl" >&5
+echo "configure:5165: 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
@@ -5171,7 +5169,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5175 "configure"
+#line 5173 "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
@@ -5182,7 +5180,7 @@ int main() {
SSL_get_version()
; return 0; }
EOF
-if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5184: \"$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
@@ -5213,7 +5211,7 @@ fi
;;
no)
echo $ac_n "checking for SSL""... $ac_c" 1>&6
-echo "configure:5217: checking for SSL" >&5
+echo "configure:5215: checking for SSL" >&5
echo "$ac_t""suppressed" 1>&6
unset SSL
;;
@@ -5221,7 +5219,7 @@ echo "configure:5217: 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:5225: checking for main in -lcrypto" >&5
+echo "configure:5223: 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
@@ -5229,14 +5227,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5233 "configure"
+#line 5231 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5238: \"$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
@@ -5265,7 +5263,7 @@ LDFLAGS="$saved_LDFLAGS"; unset SSL
fi
echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6
-echo "configure:5269: checking for SSL_get_version in -lssl" >&5
+echo "configure:5267: 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
@@ -5273,7 +5271,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5277 "configure"
+#line 5275 "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
@@ -5284,7 +5282,7 @@ int main() {
SSL_get_version()
; return 0; }
EOF
-if { (eval echo configure:5288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5286: \"$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
@@ -5332,17 +5330,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:5336: checking for $ac_hdr" >&5
+echo "configure:5334: 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 5341 "configure"
+#line 5339 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5344: \"$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*
@@ -5370,7 +5368,7 @@ fi
done
echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6
-echo "configure:5374: checking for globus_module_activate in -lglobus_common" >&5
+echo "configure:5372: 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
@@ -5378,7 +5376,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_common $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5382 "configure"
+#line 5380 "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
@@ -5389,7 +5387,7 @@ int main() {
globus_module_activate()
; return 0; }
EOF
-if { (eval echo configure:5393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5391: \"$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
@@ -5418,7 +5416,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6
-echo "configure:5422: checking for main in -lglobus_gass_cache" >&5
+echo "configure:5420: 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
@@ -5426,14 +5424,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_cache $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5430 "configure"
+#line 5428 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5435: \"$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
@@ -5462,7 +5460,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6
-echo "configure:5466: checking for main in -lglobus_gaa" >&5
+echo "configure:5464: 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
@@ -5470,14 +5468,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gaa $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5474 "configure"
+#line 5472 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5479: \"$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
@@ -5506,7 +5504,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6
-echo "configure:5510: checking for main in -lglobus_gss" >&5
+echo "configure:5508: 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
@@ -5514,14 +5512,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gss $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5518 "configure"
+#line 5516 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5523: \"$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
@@ -5550,7 +5548,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6
-echo "configure:5554: checking for main in -lglobus_gss_assist" >&5
+echo "configure:5552: 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
@@ -5558,14 +5556,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gss_assist $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5562 "configure"
+#line 5560 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5567: \"$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
@@ -5594,7 +5592,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6
-echo "configure:5598: checking for main in -lglobus_io" >&5
+echo "configure:5596: 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
@@ -5602,14 +5600,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_io $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5606 "configure"
+#line 5604 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5611: \"$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
@@ -5638,7 +5636,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6
-echo "configure:5642: checking for main in -lglobus_gass_transfer_assist" >&5
+echo "configure:5640: 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
@@ -5646,14 +5644,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_transfer_assist $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5650 "configure"
+#line 5648 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5655: \"$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
@@ -5682,7 +5680,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6
-echo "configure:5686: checking for main in -lglobus_gass_transfer" >&5
+echo "configure:5684: 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
@@ -5690,14 +5688,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_transfer $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5694 "configure"
+#line 5692 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5699: \"$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
@@ -5726,7 +5724,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6
-echo "configure:5730: checking for globus_gass_open in -lglobus_gass_file" >&5
+echo "configure:5728: 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
@@ -5734,7 +5732,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_file $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5738 "configure"
+#line 5736 "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
@@ -5745,7 +5743,7 @@ int main() {
globus_gass_open()
; return 0; }
EOF
-if { (eval echo configure:5749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5747: \"$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
@@ -5777,7 +5775,7 @@ fi
no)
echo $ac_n "checking for GASS""... $ac_c" 1>&6
-echo "configure:5781: checking for GASS" >&5
+echo "configure:5779: checking for GASS" >&5
echo "$ac_t""suppressed" 1>&6
unset GASS TESTGASS
;;
@@ -5803,17 +5801,17 @@ echo "configure:5781: 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:5807: checking for $ac_hdr" >&5
+echo "configure:5805: 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 5812 "configure"
+#line 5810 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5815: \"$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*
@@ -5846,17 +5844,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5850: checking for $ac_hdr" >&5
+echo "configure:5848: 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 5855 "configure"
+#line 5853 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5858: \"$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*
@@ -5888,7 +5886,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:5892: checking for globus_module_activate in -lglobus_common" >&5
+echo "configure:5890: 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
@@ -5896,7 +5894,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_common $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5900 "configure"
+#line 5898 "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
@@ -5907,7 +5905,7 @@ int main() {
globus_module_activate()
; return 0; }
EOF
-if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5909: \"$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
@@ -5936,7 +5934,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6
-echo "configure:5940: checking for main in -lglobus_gass_cache" >&5
+echo "configure:5938: 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
@@ -5944,14 +5942,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_cache $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5948 "configure"
+#line 5946 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5953: \"$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
@@ -5980,7 +5978,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6
-echo "configure:5984: checking for main in -lglobus_gaa" >&5
+echo "configure:5982: 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
@@ -5988,14 +5986,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gaa $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5992 "configure"
+#line 5990 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5997: \"$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
@@ -6024,7 +6022,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6
-echo "configure:6028: checking for main in -lglobus_gss" >&5
+echo "configure:6026: 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
@@ -6032,14 +6030,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gss $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6036 "configure"
+#line 6034 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6041: \"$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
@@ -6068,7 +6066,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6
-echo "configure:6072: checking for main in -lglobus_gss_assist" >&5
+echo "configure:6070: 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
@@ -6076,14 +6074,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gss_assist $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6080 "configure"
+#line 6078 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6085: \"$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
@@ -6112,7 +6110,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6
-echo "configure:6116: checking for main in -lglobus_io" >&5
+echo "configure:6114: 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
@@ -6120,14 +6118,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_io $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6124 "configure"
+#line 6122 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6129: \"$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
@@ -6156,7 +6154,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6
-echo "configure:6160: checking for main in -lglobus_gass_transfer_assist" >&5
+echo "configure:6158: 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
@@ -6164,14 +6162,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_transfer_assist $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6168 "configure"
+#line 6166 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6173: \"$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
@@ -6200,7 +6198,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6
-echo "configure:6204: checking for main in -lglobus_gass_transfer" >&5
+echo "configure:6202: 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
@@ -6208,14 +6206,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_transfer $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6212 "configure"
+#line 6210 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6217: \"$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
@@ -6244,7 +6242,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6
-echo "configure:6248: checking for globus_gass_open in -lglobus_gass_file" >&5
+echo "configure:6246: 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
@@ -6252,7 +6250,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_file $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6256 "configure"
+#line 6254 "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
@@ -6263,7 +6261,7 @@ int main() {
globus_gass_open()
; return 0; }
EOF
-if { (eval echo configure:6267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6265: \"$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
@@ -6293,7 +6291,7 @@ fi
else
echo $ac_n "checking for globus_module_activate in -lglobus_common""... $ac_c" 1>&6
-echo "configure:6297: checking for globus_module_activate in -lglobus_common" >&5
+echo "configure:6295: 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
@@ -6301,7 +6299,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_common $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6305 "configure"
+#line 6303 "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
@@ -6312,7 +6310,7 @@ int main() {
globus_module_activate()
; return 0; }
EOF
-if { (eval echo configure:6316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6314: \"$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
@@ -6341,7 +6339,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_cache""... $ac_c" 1>&6
-echo "configure:6345: checking for main in -lglobus_gass_cache" >&5
+echo "configure:6343: 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
@@ -6349,14 +6347,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_cache $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6353 "configure"
+#line 6351 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6358: \"$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
@@ -6385,7 +6383,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gaa""... $ac_c" 1>&6
-echo "configure:6389: checking for main in -lglobus_gaa" >&5
+echo "configure:6387: 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
@@ -6393,14 +6391,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gaa $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6397 "configure"
+#line 6395 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6402: \"$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
@@ -6429,7 +6427,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gss""... $ac_c" 1>&6
-echo "configure:6433: checking for main in -lglobus_gss" >&5
+echo "configure:6431: 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
@@ -6437,14 +6435,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gss $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6441 "configure"
+#line 6439 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6446: \"$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
@@ -6473,7 +6471,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gss_assist""... $ac_c" 1>&6
-echo "configure:6477: checking for main in -lglobus_gss_assist" >&5
+echo "configure:6475: 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
@@ -6481,14 +6479,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gss_assist $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6485 "configure"
+#line 6483 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6490: \"$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
@@ -6517,7 +6515,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_io""... $ac_c" 1>&6
-echo "configure:6521: checking for main in -lglobus_io" >&5
+echo "configure:6519: 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
@@ -6525,14 +6523,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_io $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6529 "configure"
+#line 6527 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6534: \"$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
@@ -6561,7 +6559,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_transfer_assist""... $ac_c" 1>&6
-echo "configure:6565: checking for main in -lglobus_gass_transfer_assist" >&5
+echo "configure:6563: 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
@@ -6569,14 +6567,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_transfer_assist $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6573 "configure"
+#line 6571 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6578: \"$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
@@ -6605,7 +6603,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for main in -lglobus_gass_transfer""... $ac_c" 1>&6
-echo "configure:6609: checking for main in -lglobus_gass_transfer" >&5
+echo "configure:6607: 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
@@ -6613,14 +6611,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_transfer $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6617 "configure"
+#line 6615 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6622: \"$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
@@ -6649,7 +6647,7 @@ unset GASS TESTGASS
fi
echo $ac_n "checking for globus_gass_open in -lglobus_gass_file""... $ac_c" 1>&6
-echo "configure:6653: checking for globus_gass_open in -lglobus_gass_file" >&5
+echo "configure:6651: 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
@@ -6657,7 +6655,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglobus_gass_file $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6661 "configure"
+#line 6659 "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
@@ -6668,7 +6666,7 @@ int main() {
globus_gass_open()
; return 0; }
EOF
-if { (eval echo configure:6672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6670: \"$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
@@ -6707,460 +6705,6 @@ 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:6728: 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 6733 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6738: \"$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:6766: 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 6774 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:6781: \"$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:6810: 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 6818 "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:6829: \"$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:6860: 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:6885: 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 6890 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6895: \"$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:6928: 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 6933 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6938: \"$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:6970: 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 6978 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:6985: \"$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:7014: 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 7022 "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:7033: \"$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:7063: 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 7071 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:7078: \"$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:7107: 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 7115 "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:7126: \"$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
-
SRB="yes"
TESTSRB='$(srcdir)/testsrb'
# Check whether --with-srb or --without-srb was given.
@@ -7178,17 +6722,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:7182: checking for $ac_hdr" >&5
+echo "configure:6726: 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 7187 "configure"
+#line 6731 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6736: \"$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*
@@ -7216,7 +6760,7 @@ fi
done
echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6
-echo "configure:7220: checking for main in -lelf" >&5
+echo "configure:6764: 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
@@ -7224,14 +6768,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lelf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7228 "configure"
+#line 6772 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6779: \"$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
@@ -7260,7 +6804,7 @@ unset SRB TESTSRB
fi
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:7264: checking for main in -lsocket" >&5
+echo "configure:6808: 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
@@ -7268,14 +6812,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7272 "configure"
+#line 6816 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6823: \"$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
@@ -7304,7 +6848,7 @@ unset SRB TESTSRB
fi
echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6
-echo "configure:7308: checking for clConnect in -lSrbClient" >&5
+echo "configure:6852: 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
@@ -7312,7 +6856,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lSrbClient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7316 "configure"
+#line 6860 "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
@@ -7323,7 +6867,7 @@ int main() {
clConnect()
; return 0; }
EOF
-if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6871: \"$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
@@ -7354,7 +6898,7 @@ fi
;;
no)
echo $ac_n "checking for SRB""... $ac_c" 1>&6
-echo "configure:7358: checking for SRB" >&5
+echo "configure:6902: checking for SRB" >&5
echo "$ac_t""suppressed" 1>&6
unset SRB TESTSRB
;;
@@ -7379,17 +6923,17 @@ echo "configure:7358: 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:7383: checking for $ac_hdr" >&5
+echo "configure:6927: 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 7388 "configure"
+#line 6932 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6937: \"$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*
@@ -7422,17 +6966,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7426: checking for $ac_hdr" >&5
+echo "configure:6970: 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 7431 "configure"
+#line 6975 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6980: \"$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*
@@ -7464,7 +7008,7 @@ done
saved_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$srb_lib"
echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6
-echo "configure:7468: checking for main in -lelf" >&5
+echo "configure:7012: 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
@@ -7472,14 +7016,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lelf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7476 "configure"
+#line 7020 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7027: \"$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
@@ -7508,7 +7052,7 @@ unset SRB TESTSRB
fi
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:7512: checking for main in -lsocket" >&5
+echo "configure:7056: 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
@@ -7516,14 +7060,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7520 "configure"
+#line 7064 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7071: \"$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
@@ -7552,7 +7096,7 @@ unset SRB TESTSRB
fi
echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6
-echo "configure:7556: checking for clConnect in -lSrbClient" >&5
+echo "configure:7100: 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
@@ -7560,7 +7104,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lSrbClient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7564 "configure"
+#line 7108 "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
@@ -7571,7 +7115,7 @@ int main() {
clConnect()
; return 0; }
EOF
-if { (eval echo configure:7575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7119: \"$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
@@ -7601,7 +7145,7 @@ fi
else
echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6
-echo "configure:7605: checking for main in -lelf" >&5
+echo "configure:7149: 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
@@ -7609,14 +7153,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lelf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7613 "configure"
+#line 7157 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7164: \"$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
@@ -7645,7 +7189,7 @@ unset SRB TESTSRB
fi
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:7649: checking for main in -lsocket" >&5
+echo "configure:7193: 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
@@ -7653,14 +7197,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7657 "configure"
+#line 7201 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7208: \"$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
@@ -7689,7 +7233,7 @@ unset SRB TESTSRB
fi
echo $ac_n "checking for clConnect in -lSrbClient""... $ac_c" 1>&6
-echo "configure:7693: checking for clConnect in -lSrbClient" >&5
+echo "configure:7237: 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
@@ -7697,7 +7241,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lSrbClient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7701 "configure"
+#line 7245 "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
@@ -7708,7 +7252,7 @@ int main() {
clConnect()
; return 0; }
EOF
-if { (eval echo configure:7712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7256: \"$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
@@ -7749,7 +7293,7 @@ fi
echo $ac_n "checking for PD_open in -lpdb""... $ac_c" 1>&6
-echo "configure:7753: checking for PD_open in -lpdb" >&5
+echo "configure:7297: 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
@@ -7757,7 +7301,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpdb $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7761 "configure"
+#line 7305 "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
@@ -7768,7 +7312,7 @@ int main() {
PD_open()
; return 0; }
EOF
-if { (eval echo configure:7772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7316: \"$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
@@ -7796,7 +7340,7 @@ else
fi
echo $ac_n "checking for lite_PD_open in -lsilo""... $ac_c" 1>&6
-echo "configure:7800: checking for lite_PD_open in -lsilo" >&5
+echo "configure:7344: 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
@@ -7804,7 +7348,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsilo $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7808 "configure"
+#line 7352 "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
@@ -7815,7 +7359,7 @@ int main() {
lite_PD_open()
; return 0; }
EOF
-if { (eval echo configure:7819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7363: \"$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
@@ -7846,17 +7390,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:7850: checking for $ac_hdr" >&5
+echo "configure:7394: 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 7855 "configure"
+#line 7399 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7404: \"$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*
@@ -7948,17 +7492,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:7952: checking for $ac_hdr" >&5
+echo "configure:7496: 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 7957 "configure"
+#line 7501 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7506: \"$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*
@@ -7986,7 +7530,7 @@ done
if test `uname` != "FreeBSD"; then
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:7990: checking for pthread_create in -lpthread" >&5
+echo "configure:7534: 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
@@ -7994,7 +7538,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7998 "configure"
+#line 7542 "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
@@ -8005,7 +7549,7 @@ int main() {
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:8009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7553: \"$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
@@ -8041,7 +7585,7 @@ fi
;;
no)
echo $ac_n "checking for pthread""... $ac_c" 1>&6
-echo "configure:8045: checking for pthread" >&5
+echo "configure:7589: checking for pthread" >&5
echo "$ac_t""suppressed" 1>&6
unset PTHREAD
;;
@@ -8066,17 +7610,17 @@ echo "configure:8045: 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:8070: checking for $ac_hdr" >&5
+echo "configure:7614: 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 8075 "configure"
+#line 7619 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7624: \"$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*
@@ -8108,17 +7652,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8112: checking for $ac_hdr" >&5
+echo "configure:7656: 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 8117 "configure"
+#line 7661 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7666: \"$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*
@@ -8151,7 +7695,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:8155: checking for pthread_create in -lpthread" >&5
+echo "configure:7699: 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
@@ -8159,7 +7703,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8163 "configure"
+#line 7707 "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
@@ -8170,7 +7714,7 @@ int main() {
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:8174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7718: \"$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
@@ -8200,7 +7744,7 @@ fi
else
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:8204: checking for pthread_create in -lpthread" >&5
+echo "configure:7748: 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
@@ -8208,7 +7752,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8212 "configure"
+#line 7756 "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
@@ -8219,7 +7763,7 @@ int main() {
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:8223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7767: \"$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
@@ -8252,7 +7796,7 @@ fi
esac
echo $ac_n "checking for thread safe support""... $ac_c" 1>&6
-echo "configure:8256: checking for thread safe support" >&5
+echo "configure:7800: 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"
@@ -8287,7 +7831,7 @@ EOF
fi
echo $ac_n "checking whether HDF5 v1.4 compatibility functions enabled""... $ac_c" 1>&6
-echo "configure:8291: checking whether HDF5 v1.4 compatibility functions enabled" >&5
+echo "configure:7835: checking whether HDF5 v1.4 compatibility functions enabled" >&5
# Check whether --enable-hdf5v1_4 or --disable-hdf5v1_4 was given.
if test "${enable_hdf5v1_4+set}" = set; then
enableval="$enable_hdf5v1_4"
@@ -8306,7 +7850,7 @@ else
fi
echo $ac_n "checking for Stream Virtual File Driver support""... $ac_c" 1>&6
-echo "configure:8310: checking for Stream Virtual File Driver support" >&5
+echo "configure:7854: 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"
@@ -8320,17 +7864,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:8324: checking for $ac_hdr" >&5
+echo "configure:7868: 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 8329 "configure"
+#line 7873 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7878: \"$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*
@@ -8362,9 +7906,9 @@ EOF
echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6
-echo "configure:8366: checking if socklen_t is defined" >&5
+echo "configure:7910: checking if socklen_t is defined" >&5
cat > conftest.$ac_ext <<EOF
-#line 8368 "configure"
+#line 7912 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8383,7 +7927,7 @@ int main() {
socklen_t foo; return 0;
; return 0; }
EOF
-if { (eval echo configure:8387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_SOCKLEN_T 1
@@ -8403,9 +7947,9 @@ fi
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:8407: checking for tm_gmtoff in struct tm" >&5
+echo "configure:7951: checking for tm_gmtoff in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 8409 "configure"
+#line 7953 "configure"
#include "confdefs.h"
#include <sys/time.h>
@@ -8414,7 +7958,7 @@ int main() {
struct tm tm; tm.tm_gmtoff=0;
; return 0; }
EOF
-if { (eval echo configure:8418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TM_GMTOFF 1
@@ -8430,9 +7974,9 @@ fi
rm -f conftest*
echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:8434: checking for __tm_gmtoff in struct tm" >&5
+echo "configure:7978: checking for __tm_gmtoff in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 8436 "configure"
+#line 7980 "configure"
#include "confdefs.h"
#include <sys/time.h>
@@ -8441,7 +7985,7 @@ int main() {
struct tm tm; tm.__tm_gmtoff=0;
; return 0; }
EOF
-if { (eval echo configure:8445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE___TM_GMTOFF 1
@@ -8457,9 +8001,9 @@ fi
rm -f conftest*
echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
-echo "configure:8461: checking for global timezone variable" >&5
+echo "configure:8005: checking for global timezone variable" >&5
cat > conftest.$ac_ext <<EOF
-#line 8463 "configure"
+#line 8007 "configure"
#include "confdefs.h"
#include <sys/time.h>
@@ -8468,7 +8012,7 @@ int main() {
timezone=0;
; return 0; }
EOF
-if { (eval echo configure:8472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8016: \"$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
@@ -8484,12 +8028,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:8488: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:8032: 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 8493 "configure"
+#line 8037 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -8497,7 +8041,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; 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=time.h
else
@@ -8518,12 +8062,12 @@ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:8522: checking for tm_zone in struct tm" >&5
+echo "configure:8066: 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 8527 "configure"
+#line 8071 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -8531,7 +8075,7 @@ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:8535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -8551,12 +8095,12 @@ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:8555: checking for tzname" >&5
+echo "configure:8099: 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 8560 "configure"
+#line 8104 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -8566,7 +8110,7 @@ int main() {
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -8588,9 +8132,9 @@ EOF
fi
echo $ac_n "checking for struct timezone""... $ac_c" 1>&6
-echo "configure:8592: checking for struct timezone" >&5
+echo "configure:8136: checking for struct timezone" >&5
cat > conftest.$ac_ext <<EOF
-#line 8594 "configure"
+#line 8138 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -8600,7 +8144,7 @@ int main() {
struct timezone tz; tz.tz_minuteswest=0;
; return 0; }
EOF
-if { (eval echo configure:8604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_TIMEZONE 1
@@ -8616,9 +8160,9 @@ fi
rm -f conftest*
echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:8620: checking for st_blocks in struct stat" >&5
+echo "configure:8164: checking for st_blocks in struct stat" >&5
cat > conftest.$ac_ext <<EOF
-#line 8622 "configure"
+#line 8166 "configure"
#include "confdefs.h"
#include <sys/stat.h>
@@ -8626,7 +8170,7 @@ int main() {
struct stat sb; sb.st_blocks=0;
; return 0; }
EOF
-if { (eval echo configure:8630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STAT_ST_BLOCKS 1
@@ -8644,12 +8188,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:8648: checking for $ac_func" >&5
+echo "configure:8192: 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 8653 "configure"
+#line 8197 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8672,7 +8216,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:8676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8220: \"$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
@@ -8699,12 +8243,12 @@ done
for ac_func in _scrsize ioctl
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8703: checking for $ac_func" >&5
+echo "configure:8247: 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 8708 "configure"
+#line 8252 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8727,7 +8271,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:8731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8275: \"$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
@@ -8753,16 +8297,16 @@ done
echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6
-echo "configure:8757: checking for struct videoconfig" >&5
+echo "configure:8301: checking for struct videoconfig" >&5
cat > conftest.$ac_ext <<EOF
-#line 8759 "configure"
+#line 8303 "configure"
#include "confdefs.h"
int main() {
struct videoconfig w; w.numtextcols=0;
; return 0; }
EOF
-if { (eval echo configure:8766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_VIDEOCONFIG 1
@@ -8778,16 +8322,16 @@ fi
rm -f conftest*
echo $ac_n "checking for struct text_info""... $ac_c" 1>&6
-echo "configure:8782: checking for struct text_info" >&5
+echo "configure:8326: checking for struct text_info" >&5
cat > conftest.$ac_ext <<EOF
-#line 8784 "configure"
+#line 8328 "configure"
#include "confdefs.h"
int main() {
struct text_info w; w.screenwidth=0;
; return 0; }
EOF
-if { (eval echo configure:8791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_TEXT_INFO 1
@@ -8803,16 +8347,16 @@ fi
rm -f conftest*
echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6
-echo "configure:8807: checking for TIOCGWINSZ" >&5
+echo "configure:8351: checking for TIOCGWINSZ" >&5
cat > conftest.$ac_ext <<EOF
-#line 8809 "configure"
+#line 8353 "configure"
#include "confdefs.h"
#include <sys/ioctl.h>
int main() {
int w=TIOCGWINSZ;
; return 0; }
EOF
-if { (eval echo configure:8816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TIOCGWINSZ 1
@@ -8828,16 +8372,16 @@ fi
rm -f conftest*
echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6
-echo "configure:8832: checking for TIOCGGETD" >&5
+echo "configure:8376: checking for TIOCGGETD" >&5
cat > conftest.$ac_ext <<EOF
-#line 8834 "configure"
+#line 8378 "configure"
#include "confdefs.h"
#include <sys/ioctl.h>
int main() {
int w=TIOCGETD;
; return 0; }
EOF
-if { (eval echo configure:8841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TIOCGETD 1
@@ -8856,12 +8400,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:8860: checking for $ac_func" >&5
+echo "configure:8404: 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 8865 "configure"
+#line 8409 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8884,7 +8428,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:8888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8432: \"$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
@@ -8911,12 +8455,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:8915: checking for $ac_func" >&5
+echo "configure:8459: 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 8920 "configure"
+#line 8464 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8939,7 +8483,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:8943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8487: \"$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
@@ -8966,12 +8510,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:8970: checking for $ac_func" >&5
+echo "configure:8514: 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 8975 "configure"
+#line 8519 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8994,7 +8538,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:8998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8542: \"$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
@@ -9020,12 +8564,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:9024: checking for working const" >&5
+echo "configure:8568: 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 9029 "configure"
+#line 8573 "configure"
#include "confdefs.h"
int main() {
@@ -9074,7 +8618,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:9078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -9095,21 +8639,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:9099: checking for inline" >&5
+echo "configure:8643: 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 9106 "configure"
+#line 8650 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:9113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -9136,16 +8680,16 @@ esac
echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6
-echo "configure:9140: checking for __attribute__ extension" >&5
+echo "configure:8684: checking for __attribute__ extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 9142 "configure"
+#line 8686 "configure"
#include "confdefs.h"
int main() {
int __attribute__((unused)) x
; return 0; }
EOF
-if { (eval echo configure:9149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_ATTRIBUTE 1
@@ -9161,16 +8705,16 @@ fi
rm -f conftest*
echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6
-echo "configure:9165: checking for __FUNCTION__ extension" >&5
+echo "configure:8709: checking for __FUNCTION__ extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 9167 "configure"
+#line 8711 "configure"
#include "confdefs.h"
int main() {
(void)__FUNCTION__
; return 0; }
EOF
-if { (eval echo configure:9174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_FUNCTION 1
@@ -9186,7 +8730,7 @@ fi
rm -f conftest*
echo $ac_n "checking how to print long long""... $ac_c" 1>&6
-echo "configure:9190: checking how to print long long" >&5
+echo "configure:8734: 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
@@ -9198,7 +8742,7 @@ for hdf5_cv_printf_ll in l L q ll unknown; do
continue
else
cat > conftest.$ac_ext <<EOF
-#line 9202 "configure"
+#line 8746 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -9214,7 +8758,7 @@ int main(void)
}
EOF
-if { (eval echo configure:9218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
break
else
@@ -9235,7 +8779,7 @@ EOF
echo $ac_n "checking for debug flags""... $ac_c" 1>&6
-echo "configure:9239: checking for debug flags" >&5
+echo "configure:8783: checking for debug flags" >&5
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
@@ -9273,7 +8817,7 @@ if test -n "$DEBUG_PKG"; then
fi
echo $ac_n "checking for API tracing""... $ac_c" 1>&6
-echo "configure:9277: checking for API tracing" >&5;
+echo "configure:8821: checking for API tracing" >&5;
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
enableval="$enable_trace"
@@ -9349,7 +8893,7 @@ case "$CC_BASENAME" in
mpicc)
PARALLEL=mpicc
echo $ac_n "checking for mpirun""... $ac_c" 1>&6
-echo "configure:9353: checking for mpirun" >&5
+echo "configure:8897: checking for mpirun" >&5
cmd=`echo $CC | cut -f1 -d' '`
if (echo $cmd | grep / >/dev/null); then
@@ -9377,7 +8921,7 @@ echo "configure:9353: checking for mpirun" >&5
hcc)
PARALLEL=hcc
echo $ac_n "checking for mpirun_lam or mpirun""... $ac_c" 1>&6
-echo "configure:9381: checking for mpirun_lam or mpirun" >&5
+echo "configure:8925: checking for mpirun_lam or mpirun" >&5
cmd=`echo $CC | cut -f1 -d' '`
if (echo $cmd | grep / >/dev/null); then
@@ -9422,7 +8966,7 @@ fi
echo $ac_n "checking for parallel support files""... $ac_c" 1>&6
-echo "configure:9426: checking for parallel support files" >&5
+echo "configure:8970: checking for parallel support files" >&5
case "X-$enable_parallel" in
X-|X-no|X-none)
echo "$ac_t""skipped" 1>&6
@@ -9433,21 +8977,21 @@ case "X-$enable_parallel" in
PARALLEL=yes
cat > conftest.$ac_ext <<EOF
-#line 9437 "configure"
+#line 8981 "configure"
#include "confdefs.h"
int main() {
MPI_Init()
; return 0; }
EOF
-if { (eval echo configure:9444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8988: \"$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:9451: checking for MPI_Init in -lmpi" >&5
+echo "configure:8995: 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
@@ -9455,7 +8999,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmpi $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9459 "configure"
+#line 9003 "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
@@ -9466,7 +9010,7 @@ int main() {
MPI_Init()
; return 0; }
EOF
-if { (eval echo configure:9470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9014: \"$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
@@ -9499,21 +9043,21 @@ rm -f conftest*
if test "X$PARALLEL" = "Xyes"; then
cat > conftest.$ac_ext <<EOF
-#line 9503 "configure"
+#line 9047 "configure"
#include "confdefs.h"
int main() {
MPI_File_open()
; return 0; }
EOF
-if { (eval echo configure:9510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9054: \"$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:9517: checking for MPI_File_open in -lmpio" >&5
+echo "configure:9061: 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
@@ -9521,7 +9065,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmpio $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9525 "configure"
+#line 9069 "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
@@ -9532,7 +9076,7 @@ int main() {
MPI_File_open()
; return 0; }
EOF
-if { (eval echo configure:9536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9080: \"$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
@@ -9575,7 +9119,7 @@ rm -f conftest*
PARALLEL=mpich
echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6
-echo "configure:9579: checking for MPI_Init in -lmpich" >&5
+echo "configure:9123: 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
@@ -9583,7 +9127,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmpich $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9587 "configure"
+#line 9131 "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
@@ -9594,7 +9138,7 @@ int main() {
MPI_Init()
; return 0; }
EOF
-if { (eval echo configure:9598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9142: \"$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
@@ -9641,23 +9185,23 @@ EOF
echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6
-echo "configure:9645: checking prefix for running on one processor" >&5
+echo "configure:9189: 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:9648: checking prefix for running in parallel" >&5
+echo "configure:9192: 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:9652: checking whether a simple MPI-IO program can be linked" >&5
+echo "configure:9196: checking whether a simple MPI-IO program can be linked" >&5
cat > conftest.$ac_ext <<EOF
-#line 9654 "configure"
+#line 9198 "configure"
#include "confdefs.h"
int main() {
MPI_Init();MPI_File_open();
; return 0; }
EOF
-if { (eval echo configure:9661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9205: \"$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
@@ -9681,12 +9225,12 @@ rm -f conftest*
fi
echo $ac_n "checking whether a MPI_Get_count works correctly""... $ac_c" 1>&6
-echo "configure:9685: checking whether a MPI_Get_count works correctly" >&5
+echo "configure:9229: checking whether a MPI_Get_count works correctly" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""no" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9690 "configure"
+#line 9234 "configure"
#include "confdefs.h"
#include <mpi.h>
@@ -9707,7 +9251,7 @@ int main(int argc, char **argv)
}
EOF
-if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""no" 1>&6
else
@@ -10065,8 +9609,6 @@ s%@TESTH4TOH5@%$TESTH4TOH5%g
s%@SSL@%$SSL%g
s%@GASS@%$GASS%g
s%@TESTGASS@%$TESTGASS%g
-s%@GRIDSTORAGE@%$GRIDSTORAGE%g
-s%@TESTGRIDSTORAGE@%$TESTGRIDSTORAGE%g
s%@SRB@%$SRB%g
s%@TESTSRB@%$TESTSRB%g
s%@PDB2HDF@%$PDB2HDF%g
@@ -10560,9 +10102,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 5bb45cb..b0dabd0 100644
--- a/configure.in
+++ b/configure.in
@@ -875,72 +875,6 @@ if test -n "$GASS"; 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 Are SRB Client and other system libraries(socket, elf) present?
dnl
AC_SUBST(SRB) SRB="yes"
@@ -1955,9 +1889,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 8f5ca96..dfd1419 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
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 2722b9f..575ab37 100644
--- a/pablo/Makefile.in
+++ b/pablo/Makefile.in
@@ -41,7 +41,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 \
@@ -199,7 +199,6 @@ H5E.c: ../src/H5E.c
H5F.c: ../src/H5F.c
H5FD.c: ../src/H5FD.c
H5FDcore.c: ../src/H5FDcore.c
-H5FDdpss.c: ../src/H5FDdpss.c
H5FDfamily.c: ../src/H5FDfamily.c
H5FDgass.c: ../src/H5FDgass.c
H5FDlog.c: ../src/H5FDlog.c
diff --git a/perform/Dependencies b/perform/Dependencies
index bfbe986..9a32708 100644
--- a/perform/Dependencies
+++ b/perform/Dependencies
@@ -32,12 +32,79 @@ 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 \
$(top_srcdir)/src/H5private.h \
$(top_builddir)/src/H5config.h
+chunk.lo: \
+ $(srcdir)/chunk.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
+overhead.lo: \
+ $(srcdir)/overhead.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
mpi-perf.lo: \
$(srcdir)/mpi-perf.c \
$(top_srcdir)/src/hdf5.h \
@@ -69,7 +136,6 @@ mpi-perf.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,12 +170,11 @@ perf.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
-chunk.lo: \
- $(srcdir)/chunk.c \
+pio_perf.lo: \
+ $(srcdir)/pio_perf.c \
$(top_srcdir)/src/hdf5.h \
$(top_srcdir)/src/H5public.h \
$(top_builddir)/src/H5pubconf.h \
@@ -139,12 +204,46 @@ 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
-overhead.lo: \
- $(srcdir)/overhead.c \
+pio_engine.lo: \
+ $(srcdir)/pio_engine.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
+pio_timer.lo: \
+ $(srcdir)/pio_timer.c \
+ $(srcdir)/pio_timer.h \
$(top_srcdir)/src/hdf5.h \
$(top_srcdir)/src/H5public.h \
$(top_builddir)/src/H5pubconf.h \
@@ -174,7 +273,6 @@ 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
diff --git a/src/Dependencies b/src/Dependencies
index 58d0ced..dc962fb 100644
--- a/src/Dependencies
+++ b/src/Dependencies
@@ -122,6 +122,7 @@ H5B.lo: \
$(srcdir)/H5Epublic.h \
$(srcdir)/H5Fpkg.h \
$(srcdir)/H5FLprivate.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MFprivate.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5MMprivate.h \
@@ -130,20 +131,6 @@ H5B.lo: \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
$(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h \
$(srcdir)/H5FDmpio.h
H5D.lo: \
$(srcdir)/H5D.c \
@@ -212,8 +199,8 @@ H5F.lo: \
$(srcdir)/H5FDfamily.h \
$(srcdir)/H5FDmpio.h \
$(srcdir)/H5FDpublic.h \
+ $(srcdir)/H5Fpublic.h \
$(srcdir)/H5FDgass.h \
- $(srcdir)/H5FDdpss.h \
$(srcdir)/H5FDstream.h \
$(srcdir)/H5FDsrb.h \
$(srcdir)/H5FDmulti.h \
@@ -229,7 +216,6 @@ H5F.lo: \
$(srcdir)/H5Bprivate.h \
$(srcdir)/H5Bpublic.h \
$(srcdir)/H5Fprivate.h \
- $(srcdir)/H5Fpublic.h \
$(srcdir)/H5ACprivate.h \
$(srcdir)/H5ACpublic.h \
$(srcdir)/H5Dprivate.h \
@@ -410,29 +396,19 @@ H5FD.lo: \
H5pubconf.h \
$(srcdir)/H5api_adpt.h \
H5config.h \
- $(srcdir)/H5Eprivate.h \
- $(srcdir)/H5Epublic.h \
+ $(srcdir)/H5Dprivate.h \
+ $(srcdir)/H5Dpublic.h \
$(srcdir)/H5Ipublic.h \
- $(srcdir)/H5Fpkg.h \
$(srcdir)/H5Fprivate.h \
$(srcdir)/H5Fpublic.h \
$(srcdir)/H5FDpublic.h \
- $(srcdir)/H5FDprivate.h \
- $(srcdir)/H5FLprivate.h \
- $(srcdir)/H5Iprivate.h \
- $(srcdir)/H5MMprivate.h \
- $(srcdir)/H5MMpublic.h \
- $(srcdir)/H5Pprivate.h \
- $(srcdir)/H5Ppublic.h \
- $(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
$(srcdir)/H5Gprivate.h \
$(srcdir)/H5Gpublic.h \
$(srcdir)/H5Bprivate.h \
$(srcdir)/H5Bpublic.h \
$(srcdir)/H5ACprivate.h \
$(srcdir)/H5ACpublic.h \
+ $(srcdir)/H5MMpublic.h \
$(srcdir)/H5Oprivate.h \
$(srcdir)/H5Opublic.h \
$(srcdir)/H5HGprivate.h \
@@ -443,7 +419,17 @@ H5FD.lo: \
$(srcdir)/H5Rpublic.h \
$(srcdir)/H5Spublic.h \
$(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h \
+ $(srcdir)/H5Sprivate.h \
+ $(srcdir)/H5Eprivate.h \
+ $(srcdir)/H5Epublic.h \
+ $(srcdir)/H5Fpkg.h \
+ $(srcdir)/H5FDprivate.h \
+ $(srcdir)/H5FLprivate.h \
+ $(srcdir)/H5Iprivate.h \
+ $(srcdir)/H5MMprivate.h \
+ $(srcdir)/H5Pprivate.h \
+ $(srcdir)/H5Ppublic.h
H5FDsec2.lo: \
$(srcdir)/H5FDsec2.c \
$(srcdir)/H5private.h \
@@ -460,30 +446,13 @@ H5FDsec2.lo: \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FDsec2.h \
$(srcdir)/H5FLprivate.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h
H5FDfamily.lo: \
$(srcdir)/H5FDfamily.c \
$(srcdir)/H5private.h \
@@ -499,30 +468,13 @@ H5FDfamily.lo: \
$(srcdir)/H5FDpublic.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FDfamily.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h
H5FDmpio.lo: \
$(srcdir)/H5FDmpio.c \
$(srcdir)/H5private.h \
@@ -538,30 +490,13 @@ H5FDmpio.lo: \
$(srcdir)/H5FDpublic.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FDmpio.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h
H5FDcore.lo: \
$(srcdir)/H5FDcore.c \
$(srcdir)/H5private.h \
@@ -577,70 +512,13 @@ H5FDcore.lo: \
$(srcdir)/H5FDpublic.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FDcore.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(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
+ $(srcdir)/H5Zpublic.h
H5FDmulti.lo: \
$(srcdir)/H5FDmulti.c \
$(srcdir)/hdf5.h \
@@ -672,7 +550,6 @@ H5FDmulti.lo: \
$(srcdir)/H5FDstdio.h \
$(srcdir)/H5FDsrb.h \
$(srcdir)/H5FDgass.h \
- $(srcdir)/H5FDdpss.h \
$(srcdir)/H5FDstream.h \
$(srcdir)/H5FDmulti.h \
$(srcdir)/H5FDlog.h
@@ -691,30 +568,13 @@ H5FDgass.lo: \
$(srcdir)/H5FDpublic.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FDgass.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h
H5FDlog.lo: \
$(srcdir)/H5FDlog.c \
$(srcdir)/H5private.h \
@@ -731,30 +591,13 @@ H5FDlog.lo: \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FDlog.h \
$(srcdir)/H5FLprivate.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h
H5FDsrb.lo: \
$(srcdir)/H5FDsrb.c \
$(srcdir)/H5private.h \
@@ -770,30 +613,13 @@ H5FDsrb.lo: \
$(srcdir)/H5FDpublic.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FDsrb.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h
H5FDstdio.lo: \
$(srcdir)/H5FDstdio.c \
$(srcdir)/hdf5.h \
@@ -825,15 +651,16 @@ H5FDstdio.lo: \
$(srcdir)/H5FDstdio.h \
$(srcdir)/H5FDsrb.h \
$(srcdir)/H5FDgass.h \
- $(srcdir)/H5FDdpss.h \
$(srcdir)/H5FDstream.h \
$(srcdir)/H5FDmulti.h \
$(srcdir)/H5FDlog.h
H5FDstream.lo: \
$(srcdir)/H5FDstream.c \
+ $(srcdir)/H5private.h \
$(srcdir)/H5public.h \
H5pubconf.h \
- $(srcdir)/H5api_adpt.h
+ $(srcdir)/H5api_adpt.h \
+ H5config.h
H5FL.lo: \
$(srcdir)/H5FL.c \
$(srcdir)/H5private.h \
@@ -939,6 +766,7 @@ H5Gnode.lo: \
$(srcdir)/H5Gpublic.h \
$(srcdir)/H5HLprivate.h \
$(srcdir)/H5HLpublic.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MFprivate.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5MMprivate.h \
@@ -957,8 +785,6 @@ H5Gnode.lo: \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Sprivate.h \
$(srcdir)/H5FDmpio.h
H5Gstab.lo: \
$(srcdir)/H5Gstab.c \
@@ -1022,21 +848,7 @@ H5HG.lo: \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Zpublic.h
H5HL.lo: \
$(srcdir)/H5HL.c \
$(srcdir)/H5private.h \
@@ -1064,22 +876,6 @@ H5HL.lo: \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
$(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h \
$(srcdir)/H5FDmpio.h
H5I.lo: \
$(srcdir)/H5I.c \
@@ -1163,8 +959,6 @@ H5O.lo: \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Sprivate.h \
$(srcdir)/H5FDmpio.h
H5Oattr.lo: \
$(srcdir)/H5Oattr.c \
@@ -1377,9 +1171,7 @@ H5Ofill.lo: \
$(srcdir)/H5Zpublic.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
- $(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Sprivate.h
+ $(srcdir)/H5Dpublic.h
H5Olayout.lo: \
$(srcdir)/H5Olayout.c \
$(srcdir)/H5private.h \
@@ -1542,9 +1334,7 @@ H5Osdspace.lo: \
$(srcdir)/H5Spublic.h \
$(srcdir)/H5Zprivate.h \
$(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Spkg.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5Dpublic.h
+ $(srcdir)/H5Spkg.h
H5Oshared.lo: \
$(srcdir)/H5Oshared.c \
$(srcdir)/H5private.h \
@@ -1617,12 +1407,11 @@ H5P.lo: \
H5pubconf.h \
$(srcdir)/H5api_adpt.h \
H5config.h \
- $(srcdir)/H5Iprivate.h \
- $(srcdir)/H5Ipublic.h \
$(srcdir)/H5Bprivate.h \
$(srcdir)/H5Bpublic.h \
$(srcdir)/H5Fprivate.h \
$(srcdir)/H5Fpublic.h \
+ $(srcdir)/H5Ipublic.h \
$(srcdir)/H5FDpublic.h \
$(srcdir)/H5ACprivate.h \
$(srcdir)/H5ACpublic.h \
@@ -1647,7 +1436,9 @@ H5P.lo: \
$(srcdir)/H5Epublic.h \
$(srcdir)/H5FDprivate.h \
$(srcdir)/H5FLprivate.h \
+ $(srcdir)/H5Iprivate.h \
$(srcdir)/H5MMprivate.h \
+ $(srcdir)/H5Ppkg.h \
$(srcdir)/H5Pprivate.h \
$(srcdir)/H5Ppublic.h \
$(srcdir)/H5FDsec2.h
@@ -1722,9 +1513,7 @@ H5S.lo: \
$(srcdir)/H5Spublic.h \
$(srcdir)/H5Zprivate.h \
$(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Spkg.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5Dpublic.h
+ $(srcdir)/H5Spkg.h
H5Sall.lo: \
$(srcdir)/H5Sall.c \
$(srcdir)/H5private.h \
@@ -1732,36 +1521,36 @@ H5Sall.lo: \
H5pubconf.h \
$(srcdir)/H5api_adpt.h \
H5config.h \
- $(srcdir)/H5Eprivate.h \
- $(srcdir)/H5Epublic.h \
- $(srcdir)/H5Ipublic.h \
- $(srcdir)/H5Iprivate.h \
- $(srcdir)/H5Spkg.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5Spublic.h \
+ $(srcdir)/H5Dprivate.h \
$(srcdir)/H5Dpublic.h \
+ $(srcdir)/H5Ipublic.h \
$(srcdir)/H5Fprivate.h \
$(srcdir)/H5Fpublic.h \
$(srcdir)/H5FDpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
$(srcdir)/H5Gprivate.h \
$(srcdir)/H5Gpublic.h \
$(srcdir)/H5Bprivate.h \
$(srcdir)/H5Bpublic.h \
$(srcdir)/H5ACprivate.h \
$(srcdir)/H5ACpublic.h \
+ $(srcdir)/H5MMpublic.h \
+ $(srcdir)/H5Oprivate.h \
+ $(srcdir)/H5Opublic.h \
$(srcdir)/H5HGprivate.h \
$(srcdir)/H5HGpublic.h \
$(srcdir)/H5Tprivate.h \
$(srcdir)/H5Tpublic.h \
$(srcdir)/H5Rprivate.h \
$(srcdir)/H5Rpublic.h \
+ $(srcdir)/H5Spublic.h \
$(srcdir)/H5Zprivate.h \
$(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Vprivate.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5MMpublic.h
+ $(srcdir)/H5Sprivate.h \
+ $(srcdir)/H5Eprivate.h \
+ $(srcdir)/H5Epublic.h \
+ $(srcdir)/H5Iprivate.h \
+ $(srcdir)/H5Spkg.h \
+ $(srcdir)/H5Vprivate.h
H5Shyper.lo: \
$(srcdir)/H5Shyper.c \
$(srcdir)/H5private.h \
@@ -1823,24 +1612,6 @@ H5Smpio.lo: \
$(srcdir)/H5Dpublic.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Dprivate.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h \
$(srcdir)/H5Spkg.h \
$(srcdir)/H5FDmpio.h
H5Snone.lo: \
@@ -1855,28 +1626,6 @@ H5Snone.lo: \
$(srcdir)/H5Ipublic.h \
$(srcdir)/H5Iprivate.h \
$(srcdir)/H5Spkg.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Fprivate.h \
- $(srcdir)/H5Fpublic.h \
- $(srcdir)/H5FDpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Zpublic.h \
$(srcdir)/H5Vprivate.h \
$(srcdir)/H5Dprivate.h \
$(srcdir)/H5MMpublic.h
@@ -1887,37 +1636,37 @@ H5Spoint.lo: \
H5pubconf.h \
$(srcdir)/H5api_adpt.h \
H5config.h \
- $(srcdir)/H5Eprivate.h \
- $(srcdir)/H5Epublic.h \
- $(srcdir)/H5Ipublic.h \
- $(srcdir)/H5Iprivate.h \
- $(srcdir)/H5MMprivate.h \
- $(srcdir)/H5MMpublic.h \
- $(srcdir)/H5Spkg.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5Spublic.h \
+ $(srcdir)/H5Dprivate.h \
$(srcdir)/H5Dpublic.h \
+ $(srcdir)/H5Ipublic.h \
$(srcdir)/H5Fprivate.h \
$(srcdir)/H5Fpublic.h \
$(srcdir)/H5FDpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
$(srcdir)/H5Gprivate.h \
$(srcdir)/H5Gpublic.h \
$(srcdir)/H5Bprivate.h \
$(srcdir)/H5Bpublic.h \
$(srcdir)/H5ACprivate.h \
$(srcdir)/H5ACpublic.h \
+ $(srcdir)/H5MMpublic.h \
+ $(srcdir)/H5Oprivate.h \
+ $(srcdir)/H5Opublic.h \
$(srcdir)/H5HGprivate.h \
$(srcdir)/H5HGpublic.h \
$(srcdir)/H5Tprivate.h \
$(srcdir)/H5Tpublic.h \
$(srcdir)/H5Rprivate.h \
$(srcdir)/H5Rpublic.h \
+ $(srcdir)/H5Spublic.h \
$(srcdir)/H5Zprivate.h \
$(srcdir)/H5Zpublic.h \
- $(srcdir)/H5Vprivate.h \
- $(srcdir)/H5Dprivate.h
+ $(srcdir)/H5Sprivate.h \
+ $(srcdir)/H5Eprivate.h \
+ $(srcdir)/H5Epublic.h \
+ $(srcdir)/H5Iprivate.h \
+ $(srcdir)/H5MMprivate.h \
+ $(srcdir)/H5Spkg.h \
+ $(srcdir)/H5Vprivate.h
H5Sselect.lo: \
$(srcdir)/H5Sselect.c \
$(srcdir)/H5private.h \
@@ -1933,28 +1682,6 @@ H5Sselect.lo: \
$(srcdir)/H5MMprivate.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Spkg.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5Spublic.h \
- $(srcdir)/H5Dpublic.h \
- $(srcdir)/H5Fprivate.h \
- $(srcdir)/H5Fpublic.h \
- $(srcdir)/H5FDpublic.h \
- $(srcdir)/H5Oprivate.h \
- $(srcdir)/H5Opublic.h \
- $(srcdir)/H5Gprivate.h \
- $(srcdir)/H5Gpublic.h \
- $(srcdir)/H5Bprivate.h \
- $(srcdir)/H5Bpublic.h \
- $(srcdir)/H5ACprivate.h \
- $(srcdir)/H5ACpublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
- $(srcdir)/H5Tprivate.h \
- $(srcdir)/H5Tpublic.h \
- $(srcdir)/H5Rprivate.h \
- $(srcdir)/H5Rpublic.h \
- $(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Zpublic.h \
$(srcdir)/H5Vprivate.h
H5T.lo: \
$(srcdir)/H5T.c \
@@ -2051,6 +1778,9 @@ H5Tconv.lo: \
$(srcdir)/H5Dpublic.h \
$(srcdir)/H5Fpublic.h \
$(srcdir)/H5Zpublic.h \
+ $(srcdir)/H5Tpkg.h \
+ $(srcdir)/H5HGprivate.h \
+ $(srcdir)/H5HGpublic.h \
$(srcdir)/H5Fprivate.h \
$(srcdir)/H5FDpublic.h \
$(srcdir)/H5Dprivate.h \
@@ -2062,16 +1792,13 @@ H5Tconv.lo: \
$(srcdir)/H5ACpublic.h \
$(srcdir)/H5Oprivate.h \
$(srcdir)/H5Opublic.h \
- $(srcdir)/H5HGprivate.h \
- $(srcdir)/H5HGpublic.h \
$(srcdir)/H5Tprivate.h \
$(srcdir)/H5Tpublic.h \
$(srcdir)/H5Rprivate.h \
$(srcdir)/H5Rpublic.h \
$(srcdir)/H5Spublic.h \
$(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5Tpkg.h
+ $(srcdir)/H5Sprivate.h
H5Tinit.lo: \
H5Tinit.c \
$(srcdir)/H5private.h \
@@ -2131,6 +1858,8 @@ H5Tvlen.lo: \
$(srcdir)/H5Dpublic.h \
$(srcdir)/H5MMpublic.h \
$(srcdir)/H5Zpublic.h \
+ $(srcdir)/H5MMprivate.h \
+ $(srcdir)/H5Tpkg.h \
$(srcdir)/H5Dprivate.h \
$(srcdir)/H5Gprivate.h \
$(srcdir)/H5Gpublic.h \
@@ -2146,9 +1875,7 @@ H5Tvlen.lo: \
$(srcdir)/H5Rpublic.h \
$(srcdir)/H5Spublic.h \
$(srcdir)/H5Zprivate.h \
- $(srcdir)/H5Sprivate.h \
- $(srcdir)/H5MMprivate.h \
- $(srcdir)/H5Tpkg.h
+ $(srcdir)/H5Sprivate.h
H5TB.lo: \
$(srcdir)/H5TB.c \
$(srcdir)/H5private.h \
diff --git a/src/H5F.c b/src/H5F.c
index 4e1e262..f61f332 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -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 */
@@ -297,9 +296,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 9884c3b..0000000
--- a/src/H5FDdpss.c
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- * Copyright © 1999-2001 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 "H5private.h" /* library function */
-#include "H5Eprivate.h" /* error handling */
-#include "H5FDprivate.h" /*file driver */
-#include "H5FDdpss.h"
-#include "H5Iprivate.h" /*object IDs */
-#include "H5MMprivate.h" /* memory management */
-#include "H5Pprivate.h" /* property lists */
-
-#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().
- */
-/* adding for windows NT file system support. */
-/* pvn: added __MWERKS__ support. */
-
-#ifdef H5_HAVE_LSEEK64
-# define file_offset_t off64_t
-# define file_seek lseek64
-#elif defined (WIN32)
-# ifdef __MWERKS__
-# define file_offset_t off_t
-# define file_seek lseek
-# else /*MSVC*/
-# define file_offset_t __int64
-# define file_seek _lseeki64
-# endif
-#else
-# define file_offset_t off_t
-# define file_seek lseek
-#endif
-
-
-/*
- * These macros check for overflow of various quantities. These macros
- * assume that file_offset_t is signed and haddr_t and size_t are unsigned.
- *
- * ADDR_OVERFLOW: Checks whether a file address of type `haddr_t'
- * is too large to be represented by the second argument
- * of the file seek function.
- *
- * SIZE_OVERFLOW: Checks whether a buffer size of type `hsize_t' is too
- * large to be represented by the `size_t' type.
- *
- * REGION_OVERFLOW: Checks whether an address and size pair describe data
- * which can be addressed entirely by the second
- * argument of the file seek function.
- */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1)
-#define ADDR_OVERFLOW(A) (HADDR_UNDEF==(A) || \
- ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z) (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || \
- sizeof(file_offset_t)<sizeof(size_t) || \
- HADDR_UNDEF==(A)+(Z) || \
- (file_offset_t)((A)+(Z))<(file_offset_t)(A))
-
-#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,
- size_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,
- size_t size, const void *buf);
-
-/* The Grid Storage I/O driver information */
-static const H5FD_class_t H5FD_dpss_g = {
- "dpss", /* name */
- MAXADDR, /* maxaddr */
- H5F_CLOSE_WEAK, /* fc_degree */
- 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)
-{
- H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=FAIL;
-
- FUNC_ENTER (H5Pset_fapl_dpss, FAIL);
- H5TRACE1("e","i",fapl_id);
-
- /* Check arguments */
- if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id)))
- HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
-
- ret_value = H5P_set_driver (plist, 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,
- size_t size, void *buf/*out*/)
-{
- H5FD_dpss_t *file = (H5FD_dpss_t *) _file;
- H5P_genplist_t *plist; /* Property list pointer */
- globus_result_t globus_result;
-#ifdef COALESCE_READS
- static hsize_t count = 0; /* counter for single reads */
-#endif
-
- FUNC_ENTER (H5FD_dpss_read, FAIL);
-
-#ifdef DEBUG
- fprintf (stdout, "H5FD_dpss_read: addr 0x%lx, size %u\n",
- (unsigned long int) addr, (unsigned) 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) {
- dxpl_id = H5P_DATASET_XFER_DEFAULT;
- if(TRUE!=H5P_isa_class(dxpl_id,H5P_DATASET_XFER) || NULL == (plist = H5I_object(dxpl_id)))
- HRETURN_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get gather read");
-
- if(!count || H5P_get(plist, H5D_XFER_GATHER_READS_NAME, &count) < 0)
- HRETURN_ERROR(H5E_S, H5E_BADTYPE, FAIL, "not xfer parms");
-
-#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, 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,
- size_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 %u\n",
- (unsigned long int) addr, (unsigned) 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, 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 fd9e2b8..0000000
--- a/src/H5FDdpss.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright © 1999-2001 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 */
diff --git a/src/Makefile.in b/src/Makefile.in
index cfd99c2..0ddf0f9 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 \
diff --git a/src/hdf5.h b/src/hdf5.h
index 70dff3b..a5bd15b 100644
--- a/src/hdf5.h
+++ b/src/hdf5.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 2048e82..b425960 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 \
+ $(srcdir)/testhdf5.h \
+ $(top_srcdir)/src/H5private.h \
+ $(top_builddir)/src/H5config.h \
+ $(top_srcdir)/src/H5Eprivate.h
testhdf5.lo: \
$(srcdir)/testhdf5.c \
$(srcdir)/testhdf5.h \
@@ -1094,47 +1111,51 @@ 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
tfile.lo: \
$(srcdir)/tfile.c \
- $(srcdir)/testhdf5.h \
- $(top_srcdir)/src/H5private.h \
+ $(top_srcdir)/src/hdf5.h \
$(top_srcdir)/src/H5public.h \
$(top_builddir)/src/H5pubconf.h \
$(top_srcdir)/src/H5api_adpt.h \
- $(top_builddir)/src/H5config.h \
- $(top_srcdir)/src/H5Eprivate.h \
- $(top_srcdir)/src/H5Epublic.h \
$(top_srcdir)/src/H5Ipublic.h \
- $(top_srcdir)/src/H5Bprivate.h \
+ $(top_srcdir)/src/H5Apublic.h \
+ $(top_srcdir)/src/H5ACpublic.h \
$(top_srcdir)/src/H5Bpublic.h \
- $(top_srcdir)/src/H5Fprivate.h \
+ $(top_srcdir)/src/H5Dpublic.h \
+ $(top_srcdir)/src/H5Epublic.h \
$(top_srcdir)/src/H5Fpublic.h \
$(top_srcdir)/src/H5FDpublic.h \
- $(top_srcdir)/src/H5ACprivate.h \
- $(top_srcdir)/src/H5ACpublic.h \
- $(top_srcdir)/src/H5Pprivate.h \
- $(top_srcdir)/src/H5Ppublic.h \
- $(top_srcdir)/src/H5Dpublic.h \
- $(top_srcdir)/src/H5MMpublic.h \
- $(top_srcdir)/src/H5Zpublic.h \
- $(top_srcdir)/src/H5Dprivate.h \
- $(top_srcdir)/src/H5Gprivate.h \
$(top_srcdir)/src/H5Gpublic.h \
- $(top_srcdir)/src/H5Oprivate.h \
- $(top_srcdir)/src/H5Opublic.h \
- $(top_srcdir)/src/H5HGprivate.h \
$(top_srcdir)/src/H5HGpublic.h \
- $(top_srcdir)/src/H5Tprivate.h \
- $(top_srcdir)/src/H5Tpublic.h \
- $(top_srcdir)/src/H5Rprivate.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/H5Zprivate.h \
- $(top_srcdir)/src/H5Sprivate.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 \
+ $(srcdir)/testhdf5.h \
+ $(top_srcdir)/src/H5private.h \
+ $(top_builddir)/src/H5config.h \
+ $(top_srcdir)/src/H5Eprivate.h \
+ $(top_srcdir)/src/H5Bprivate.h \
+ $(top_srcdir)/src/H5Fprivate.h \
+ $(top_srcdir)/src/H5ACprivate.h \
+ $(top_srcdir)/src/H5Pprivate.h
tgenprop.lo: \
$(srcdir)/tgenprop.c \
$(srcdir)/testhdf5.h \
@@ -1170,7 +1191,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
@@ -1209,8 +1229,7 @@ th5s.lo: \
$(top_srcdir)/src/H5Zpublic.h \
$(top_srcdir)/src/H5Pprivate.h \
$(top_srcdir)/src/H5Ppublic.h \
- $(top_srcdir)/src/H5MMpublic.h \
- $(top_srcdir)/src/H5Dprivate.h
+ $(top_srcdir)/src/H5MMpublic.h
titerate.lo: \
$(srcdir)/titerate.c \
$(srcdir)/testhdf5.h \
@@ -1246,7 +1265,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 +1317,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 +1355,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 +1393,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 +1443,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 +1481,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 +1516,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 +1565,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 \
@@ -1603,7 +1614,6 @@ ttsafe.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 \
@@ -1642,7 +1652,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 \
@@ -1681,7 +1690,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 \
@@ -1720,7 +1728,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 \
@@ -1759,7 +1766,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 \
@@ -1798,7 +1804,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 \
@@ -1848,7 +1853,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 \
@@ -1898,107 +1902,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 \
@@ -2048,7 +1951,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 \
@@ -2098,7 +2000,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 \
@@ -2148,7 +2049,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 \
@@ -2197,7 +2097,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 c4a2db1..a908f5f 100644
--- a/tools/h5ls/Dependencies
+++ b/tools/h5ls/Dependencies
@@ -35,7 +35,6 @@ 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 \
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 5af7039..1886282 100644
--- a/tools/misc/Dependencies
+++ b/tools/misc/Dependencies
@@ -75,7 +75,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 \