summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2005-04-07 19:41:25 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2005-04-07 19:41:25 (GMT)
commit527982782315d5940a207ff9321a8a9d04c14a1a (patch)
treea69802d91a2f0ea89d18592f0d3626613a4580cb
parent26b964c8fae1e67400bf3e6816ad441ca9b40ada (diff)
downloadhdf5-527982782315d5940a207ff9321a8a9d04c14a1a.zip
hdf5-527982782315d5940a207ff9321a8a9d04c14a1a.tar.gz
hdf5-527982782315d5940a207ff9321a8a9d04c14a1a.tar.bz2
[svn-r10570] Purpose: Maintenance
Description: Removed support for SRB driver Solution: Removed or modified appropriate files; ran reconfigure to regenerate Makefile.in and configure files. Platforms tested: heping and shanti Misc. update: ran bin/chkmanifest on heping
-rw-r--r--MANIFEST5
-rw-r--r--Makefile.in4
-rw-r--r--c++/Makefile.in4
-rw-r--r--c++/examples/Makefile.in4
-rw-r--r--c++/src/Makefile.in4
-rw-r--r--c++/test/Makefile.in4
-rwxr-xr-xconfigure1328
-rw-r--r--configure.in77
-rw-r--r--doc/Makefile.in4
-rw-r--r--doc/html/ADGuide/Makefile.in4
-rw-r--r--doc/html/Graphics/Makefile.in4
-rw-r--r--doc/html/Intro/Makefile.in4
-rw-r--r--doc/html/Makefile.in4
-rw-r--r--doc/html/PSandPDF/Makefile.in4
-rw-r--r--doc/html/TechNotes/Makefile.in4
-rw-r--r--doc/html/Tutor/Graphics/Makefile.in4
-rw-r--r--doc/html/Tutor/Makefile.in4
-rw-r--r--doc/html/Tutor/examples/Makefile.in4
-rw-r--r--doc/html/cpplus/Makefile.in4
-rw-r--r--doc/html/ed_libs/Makefile.in4
-rw-r--r--doc/html/ed_styles/Makefile.in4
-rw-r--r--doc/html/fortran/Makefile.in4
-rw-r--r--examples/Makefile.in4
-rw-r--r--fortran/Makefile.in4
-rw-r--r--fortran/examples/Makefile.in4
-rw-r--r--fortran/src/Makefile.in4
-rw-r--r--fortran/test/Makefile.in4
-rw-r--r--fortran/testpar/Makefile.in4
-rwxr-xr-xhl/Makefile.in4
-rw-r--r--hl/c++/Makefile.in4
-rw-r--r--hl/c++/src/Makefile.in4
-rw-r--r--hl/c++/test/Makefile.in4
-rw-r--r--hl/fortran/Makefile.in4
-rw-r--r--hl/fortran/src/Makefile.in4
-rw-r--r--hl/fortran/test/Makefile.in4
-rw-r--r--hl/src/Makefile.in4
-rw-r--r--hl/test/Makefile.in4
-rw-r--r--hl/tools/gif2h5/Makefile.in4
-rw-r--r--perform/Makefile.in4
-rw-r--r--release_docs/INSTALL3
-rw-r--r--release_docs/INSTALL_VFL1
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/H5F.c1
-rw-r--r--src/H5FD.c4
-rw-r--r--src/H5FDsrb.c843
-rw-r--r--src/H5FDsrb.h57
-rw-r--r--src/H5config.h.in15
-rw-r--r--src/H5public.h3
-rwxr-xr-xsrc/Makefile.am9
-rw-r--r--src/Makefile.in53
-rw-r--r--src/hdf5.h3
-rwxr-xr-xsrc/hdf5.lnt1
-rw-r--r--test/Makefile.am7
-rw-r--r--test/Makefile.in55
-rw-r--r--test/srb_append.c196
-rw-r--r--test/srb_read.c225
-rw-r--r--test/srb_write.c193
-rw-r--r--testpar/Makefile.in4
-rw-r--r--tools/Makefile.in4
-rw-r--r--tools/gifconv/Makefile.in4
-rw-r--r--tools/h5diff/Makefile.in4
-rw-r--r--tools/h5dump/Makefile.in4
-rwxr-xr-xtools/h5import/Makefile.in4
-rw-r--r--tools/h5jam/Makefile.in4
-rw-r--r--tools/h5ls/Makefile.in4
-rw-r--r--tools/h5repack/Makefile.in4
-rw-r--r--tools/lib/Makefile.in4
-rw-r--r--tools/misc/Makefile.in4
68 files changed, 54 insertions, 3215 deletions
diff --git a/MANIFEST b/MANIFEST
index 73a7c72..6c8a612 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -844,8 +844,6 @@
./src/H5FDpublic.h
./src/H5FDsec2.c
./src/H5FDsec2.h
-./src/H5FDsrb.c
-./src/H5FDsrb.h
./src/H5FDstdio.c
./src/H5FDstdio.h
./src/H5FDstream.c
@@ -1038,9 +1036,6 @@
./test/gen_new_mtime.c _DO_NOT_DISTRIBUTE_
./test/gen_new_super.c _DO_NOT_DISTRIBUTE_
./test/set_extent.c
-./test/srb_append.c
-./test/srb_read.c
-./test/srb_write.c
./test/sheap.c
./test/stab.c
./test/stream_test.c
diff --git a/Makefile.in b/Makefile.in
index 582efab..0dc46f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,8 +130,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -223,11 +221,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 403bfba..45c5877 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -100,8 +100,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -193,11 +191,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 02a9f3d..02c5306 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -92,8 +92,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -185,11 +183,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index a604f3d..f9c0818 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -134,8 +134,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -227,11 +225,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index ffd7bf2..e5f1f9f 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -123,8 +123,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -216,11 +214,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/configure b/configure
index ce003fc..19f7af4 100755
--- a/configure
+++ b/configure
@@ -467,7 +467,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP SRB TESTSRB BUILD_SRB_CONDITIONAL_TRUE BUILD_SRB_CONDITIONAL_FALSE BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1106,7 +1106,6 @@ Optional Packages:
[default=yes]
--with-szlib=DIR Use szlib library for external szlib I/O filter
[default=no]
- --with-srb=DIR Use the SRB library [default=no]
--with-pthread=DIR Use the Pthreads library [default=no]
--with-mpe=DIR Use MPE instrumentation [default=no]
@@ -3506,7 +3505,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:3509:" \
+echo "$as_me:3508:" \
"checking for Fortran compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -3801,7 +3800,7 @@ _ACEOF
# flags.
ac_save_FFLAGS=$FCFLAGS
FCFLAGS="$FCFLAGS $ac_verb"
-(eval echo $as_me:3804: \"$ac_link\") >&5
+(eval echo $as_me:3803: \"$ac_link\") >&5
ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
@@ -3879,7 +3878,7 @@ _ACEOF
# flags.
ac_save_FFLAGS=$FCFLAGS
FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
-(eval echo $as_me:3882: \"$ac_link\") >&5
+(eval echo $as_me:3881: \"$ac_link\") >&5
ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
@@ -6363,7 +6362,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6366 "configure"' > conftest.$ac_ext
+ echo '#line 6365 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7493,7 +7492,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:7496:" \
+echo "$as_me:7495:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8562,11 +8561,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8565: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8564: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8569: \$? = $ac_status" >&5
+ echo "$as_me:8568: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8817,11 +8816,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8820: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8819: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8824: \$? = $ac_status" >&5
+ echo "$as_me:8823: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8877,11 +8876,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8880: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8879: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8884: \$? = $ac_status" >&5
+ echo "$as_me:8883: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11149,7 +11148,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11152 "configure"
+#line 11151 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11247,7 +11246,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11250 "configure"
+#line 11249 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13483,11 +13482,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13485: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13490: \$? = $ac_status" >&5
+ echo "$as_me:13489: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13543,11 +13542,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13546: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13545: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13550: \$? = $ac_status" >&5
+ echo "$as_me:13549: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14962,7 +14961,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14965 "configure"
+#line 14964 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15060,7 +15059,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15063 "configure"
+#line 15062 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15915,11 +15914,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15918: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15917: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15922: \$? = $ac_status" >&5
+ echo "$as_me:15921: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15975,11 +15974,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15978: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15977: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15982: \$? = $ac_status" >&5
+ echo "$as_me:15981: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18031,11 +18030,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18034: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18033: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18038: \$? = $ac_status" >&5
+ echo "$as_me:18037: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -18286,11 +18285,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18289: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18288: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18293: \$? = $ac_status" >&5
+ echo "$as_me:18292: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -18346,11 +18345,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18349: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18348: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18353: \$? = $ac_status" >&5
+ echo "$as_me:18352: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20618,7 +20617,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20621 "configure"
+#line 20620 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20716,7 +20715,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20719 "configure"
+#line 20718 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -43500,1256 +43499,6 @@ echo "${ECHO_T}no" >&6
fi
- SRB="yes"
- TESTSRB='$(srcdir)/testsrb'
-
-# Check whether --with-srb or --without-srb was given.
-if test "${with_srb+set}" = set; then
- withval="$with_srb"
-
-else
- withval=no
-fi;
-
-case "$withval" in
- yes)
-
-for ac_header in srbClient.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to hdfhelp@ncsa.uiuc.edu ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
- unset SRB TESTSRB
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for main in -lelf" >&5
-echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6
-if test "${ac_cv_lib_elf_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lelf $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_elf_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_elf_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
-echo "${ECHO_T}$ac_cv_lib_elf_main" >&6
-if test $ac_cv_lib_elf_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBELF 1
-_ACEOF
-
- LIBS="-lelf $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lsocket" >&5
-echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_socket_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
-if test $ac_cv_lib_socket_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
- LIBS="-lsocket $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
-
-echo "$as_me:$LINENO: checking for clConnect in -lSrbClient" >&5
-echo $ECHO_N "checking for clConnect in -lSrbClient... $ECHO_C" >&6
-if test "${ac_cv_lib_SrbClient_clConnect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSrbClient $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char clConnect ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-clConnect ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_SrbClient_clConnect=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_SrbClient_clConnect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SrbClient_clConnect" >&5
-echo "${ECHO_T}$ac_cv_lib_SrbClient_clConnect" >&6
-if test $ac_cv_lib_SrbClient_clConnect = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSRBCLIENT 1
-_ACEOF
-
- LIBS="-lSrbClient $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
- ;;
- no)
- echo "$as_me:$LINENO: checking for SRB" >&5
-echo $ECHO_N "checking for SRB... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: suppressed" >&5
-echo "${ECHO_T}suppressed" >&6
- unset SRB TESTSRB
- ;;
- *)
- case "$withval" in
- *,*)
- srb_inc="`echo $withval | cut -f1 -d,`"
- srb_lib="`echo $withval | cut -f2 -d, -s`"
- ;;
- *)
- if test -n "$withval"; then
- srb_inc="$withval/include"
- srb_lib="$withval/lib"
- fi
- ;;
- esac
-
- if test "X$srb_inc" = "X/usr/include"; then
- srb_inc=""
- fi
- if test "X$srb_lib" = "X/usr/lib"; then
- srb_lib=""
- fi
-
- if test -n "$srb_inc"; then
- saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$srb_inc"
-
-for ac_header in srbClient.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to hdfhelp@ncsa.uiuc.edu ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
- CPPFLAGS="$saved_CPPFLAGS"
- unset SRB TESTSRB
-fi
-
-done
-
- else
-
-for ac_header in srbClient.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to hdfhelp@ncsa.uiuc.edu ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
- fi
-
- if test -n "$srb_lib"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$srb_lib"
-
-echo "$as_me:$LINENO: checking for main in -lelf" >&5
-echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6
-if test "${ac_cv_lib_elf_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lelf $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_elf_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_elf_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
-echo "${ECHO_T}$ac_cv_lib_elf_main" >&6
-if test $ac_cv_lib_elf_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBELF 1
-_ACEOF
-
- LIBS="-lelf $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lsocket" >&5
-echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_socket_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
-if test $ac_cv_lib_socket_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
- LIBS="-lsocket $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
-
-echo "$as_me:$LINENO: checking for clConnect in -lSrbClient" >&5
-echo $ECHO_N "checking for clConnect in -lSrbClient... $ECHO_C" >&6
-if test "${ac_cv_lib_SrbClient_clConnect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSrbClient $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char clConnect ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-clConnect ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_SrbClient_clConnect=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_SrbClient_clConnect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SrbClient_clConnect" >&5
-echo "${ECHO_T}$ac_cv_lib_SrbClient_clConnect" >&6
-if test $ac_cv_lib_SrbClient_clConnect = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSRBCLIENT 1
-_ACEOF
-
- LIBS="-lSrbClient $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
- else
-
-echo "$as_me:$LINENO: checking for main in -lelf" >&5
-echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6
-if test "${ac_cv_lib_elf_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lelf $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_elf_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_elf_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
-echo "${ECHO_T}$ac_cv_lib_elf_main" >&6
-if test $ac_cv_lib_elf_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBELF 1
-_ACEOF
-
- LIBS="-lelf $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lsocket" >&5
-echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_socket_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
-if test $ac_cv_lib_socket_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
- LIBS="-lsocket $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
-
-echo "$as_me:$LINENO: checking for clConnect in -lSrbClient" >&5
-echo $ECHO_N "checking for clConnect in -lSrbClient... $ECHO_C" >&6
-if test "${ac_cv_lib_SrbClient_clConnect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSrbClient $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char clConnect ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-clConnect ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_SrbClient_clConnect=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_SrbClient_clConnect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SrbClient_clConnect" >&5
-echo "${ECHO_T}$ac_cv_lib_SrbClient_clConnect" >&6
-if test $ac_cv_lib_SrbClient_clConnect = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSRBCLIENT 1
-_ACEOF
-
- LIBS="-lSrbClient $LIBS"
-
-else
- unset SRB TESTSRB
-fi
-
- fi
- ;;
-esac
-
-if test -n "$SRB"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SRB 1
-_ACEOF
-
-fi
-
-
-
-if test -n "$SRB"; then
- BUILD_SRB_CONDITIONAL_TRUE=
- BUILD_SRB_CONDITIONAL_FALSE='#'
-else
- BUILD_SRB_CONDITIONAL_TRUE='#'
- BUILD_SRB_CONDITIONAL_FALSE=
-fi
-
-
echo "$as_me:$LINENO: checking for PD_open in -lpdb" >&5
@@ -51799,13 +50548,6 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${BUILD_SRB_CONDITIONAL_TRUE}" && test -z "${BUILD_SRB_CONDITIONAL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"BUILD_SRB_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_SRB_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${BUILD_PDB2HDF_CONDITIONAL_TRUE}" && test -z "${BUILD_PDB2HDF_CONDITIONAL_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_PDB2HDF_CONDITIONAL\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -52530,10 +51272,6 @@ s,@LIBTOOL@,$LIBTOOL,;t t
s,@AM_MAKEFLAGS@,$AM_MAKEFLAGS,;t t
s,@USE_FILTER_DEFLATE@,$USE_FILTER_DEFLATE,;t t
s,@USE_FILTER_SZIP@,$USE_FILTER_SZIP,;t t
-s,@SRB@,$SRB,;t t
-s,@TESTSRB@,$TESTSRB,;t t
-s,@BUILD_SRB_CONDITIONAL_TRUE@,$BUILD_SRB_CONDITIONAL_TRUE,;t t
-s,@BUILD_SRB_CONDITIONAL_FALSE@,$BUILD_SRB_CONDITIONAL_FALSE,;t t
s,@BUILD_PDB2HDF@,$BUILD_PDB2HDF,;t t
s,@BUILD_PDB2HDF_CONDITIONAL_TRUE@,$BUILD_PDB2HDF_CONDITIONAL_TRUE,;t t
s,@BUILD_PDB2HDF_CONDITIONAL_FALSE@,$BUILD_PDB2HDF_CONDITIONAL_FALSE,;t t
@@ -53498,8 +52236,6 @@ else
PRINT "No"
fi
-PRINT_N " SRB"
-IF_YES_NO "$SRB"
PRINT_N " Stream VFD"
IF_ENABLED_DISABLED "$STREAM_VFD"
diff --git a/configure.in b/configure.in
index c7c68a4..4de68de 100644
--- a/configure.in
+++ b/configure.in
@@ -1197,81 +1197,6 @@ fi
dnl ----------------------------------------------------------------------
-dnl Are SRB Client and other system libraries(socket, elf) present?
-dnl
-AC_SUBST([SRB]) SRB="yes"
-AC_SUBST([TESTSRB]) TESTSRB='$(srcdir)/testsrb'
-AC_ARG_WITH([srb],
- [AC_HELP_STRING([--with-srb=DIR],
- [Use the SRB library [default=no]])],,
- withval=no)
-
-case "$withval" in
- yes)
- AC_CHECK_HEADERS([srbClient.h],, [unset SRB TESTSRB])
- AC_CHECK_LIB([elf], [main],, [unset SRB TESTSRB])
- AC_CHECK_LIB([socket], [main],, [unset SRB TESTSRB])
- AC_CHECK_LIB([SrbClient], [clConnect],, [unset SRB TESTSRB])
- ;;
- no)
- AC_MSG_CHECKING([for SRB])
- AC_MSG_RESULT([suppressed])
- unset SRB TESTSRB
- ;;
- *)
- case "$withval" in
- *,*)
- srb_inc="`echo $withval | cut -f1 -d,`"
- srb_lib="`echo $withval | cut -f2 -d, -s`"
- ;;
- *)
- if test -n "$withval"; then
- srb_inc="$withval/include"
- srb_lib="$withval/lib"
- fi
- ;;
- esac
-
- dnl Trying to include -I/usr/include and -L/usr/lib is redundant and
- dnl can mess some compilers up.
- if test "X$srb_inc" = "X/usr/include"; then
- srb_inc=""
- fi
- if test "X$srb_lib" = "X/usr/lib"; then
- srb_lib=""
- fi
-
- if test -n "$srb_inc"; then
- saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$srb_inc"
- AC_CHECK_HEADERS(srbClient.h,,
- CPPFLAGS="$saved_CPPFLAGS"
- unset SRB TESTSRB)
- else
- AC_CHECK_HEADERS(srbClient.h)
- fi
-
- if test -n "$srb_lib"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$srb_lib"
- AC_CHECK_LIB(elf,main,,unset SRB TESTSRB)
- AC_CHECK_LIB(socket,main,,unset SRB TESTSRB)
- AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB)
- else
- AC_CHECK_LIB(elf,main,,unset SRB TESTSRB)
- AC_CHECK_LIB(socket,main,,unset SRB TESTSRB)
- AC_CHECK_LIB(SrbClient,clConnect,,unset SRB TESTSRB)
- fi
- ;;
-esac
-
-if test -n "$SRB"; then
- AC_DEFINE([HAVE_SRB], [1], [Define if the SRB is defined])
-fi
-
-AM_CONDITIONAL([BUILD_SRB_CONDITIONAL], [test -n "$SRB"])
-
-dnl ----------------------------------------------------------------------
dnl Is LLNL's PDB present? If so then we'll compile the PDB-to-HDF5
dnl translator.
dnl
@@ -3234,8 +3159,6 @@ else
PRINT "No"
fi
-PRINT_N " SRB"
-IF_YES_NO "$SRB"
PRINT_N " Stream VFD"
IF_ENABLED_DISABLED "$STREAM_VFD"
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9067dab..589c3c3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -97,8 +97,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -190,11 +188,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in
index ab4c6a5..7419614 100644
--- a/doc/html/ADGuide/Makefile.in
+++ b/doc/html/ADGuide/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in
index ca7ce3a..afa363a 100644
--- a/doc/html/Graphics/Makefile.in
+++ b/doc/html/Graphics/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in
index 210d0cd..2f436e9 100644
--- a/doc/html/Intro/Makefile.in
+++ b/doc/html/Intro/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index ca4f217..72eaa31 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -107,8 +107,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -200,11 +198,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in
index c202569..8f2e4a1 100644
--- a/doc/html/PSandPDF/Makefile.in
+++ b/doc/html/PSandPDF/Makefile.in
@@ -84,8 +84,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -177,11 +175,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in
index 193d37a..5be5c7b 100644
--- a/doc/html/TechNotes/Makefile.in
+++ b/doc/html/TechNotes/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in
index 42b05bb..6f3efd4 100644
--- a/doc/html/Tutor/Graphics/Makefile.in
+++ b/doc/html/Tutor/Graphics/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in
index 9c003b1..d18081f 100644
--- a/doc/html/Tutor/Makefile.in
+++ b/doc/html/Tutor/Makefile.in
@@ -103,8 +103,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -196,11 +194,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in
index e3481c6..ee99a99 100644
--- a/doc/html/Tutor/examples/Makefile.in
+++ b/doc/html/Tutor/examples/Makefile.in
@@ -96,8 +96,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -189,11 +187,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in
index 38d3d6b..ebe9713 100644
--- a/doc/html/cpplus/Makefile.in
+++ b/doc/html/cpplus/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in
index a5ed6ca..06cd3d9 100644
--- a/doc/html/ed_libs/Makefile.in
+++ b/doc/html/ed_libs/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in
index e9cc0f1..ee44615 100644
--- a/doc/html/ed_styles/Makefile.in
+++ b/doc/html/ed_styles/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in
index 47c3d8e..2097a98 100644
--- a/doc/html/fortran/Makefile.in
+++ b/doc/html/fortran/Makefile.in
@@ -94,8 +94,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -187,11 +185,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index a591404..e6665af 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -92,8 +92,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -185,11 +183,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 0b44d5b..dd8e34c 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -104,8 +104,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -197,11 +195,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index f906ffb..0dbbad4 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -92,8 +92,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -185,11 +183,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 7499b56..a6ec808 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -144,8 +144,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -237,11 +235,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 04f1c2b..447ac46 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -161,8 +161,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -254,11 +252,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 42d2cd1..1914500 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -116,8 +116,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -209,11 +207,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/Makefile.in b/hl/Makefile.in
index a0d737b..e7b01df 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -96,8 +96,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -189,11 +187,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index a27a385..1d60af7 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -101,8 +101,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -194,11 +192,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 3ca3fc8..d018e2b 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -123,8 +123,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -216,11 +214,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 7f9f6b8..cb1fef4 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -117,8 +117,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -210,11 +208,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index f3e1101..84b5173 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -96,8 +96,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -189,11 +187,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index b24e6ed..eab3355 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -118,8 +118,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -211,11 +209,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 5301575..a42ae3f 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -116,8 +116,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -209,11 +207,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 40bcaaf..b2208a8 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -114,8 +114,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -207,11 +205,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 687f239..87ddb2e 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -126,8 +126,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -219,11 +217,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 0dfb102..5e742e5 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -124,8 +124,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -217,11 +215,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/perform/Makefile.in b/perform/Makefile.in
index ce4e830..4df3b67 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -145,8 +145,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -238,11 +236,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/release_docs/INSTALL b/release_docs/INSTALL
index 32ddabf..310d45a 100644
--- a/release_docs/INSTALL
+++ b/release_docs/INSTALL
@@ -131,8 +131,7 @@
3.3. Certain Virtual File Layer(VFL)
If users want to install with special Virtual File Layer(VFL),
- please go to read INSTALL_VFL file. SRB and Globus-GASS have
- been documented.
+ please go to read INSTALL_VFL file.
4. HDF5 dependencies
diff --git a/release_docs/INSTALL_VFL b/release_docs/INSTALL_VFL
index d0466a3..4385c26 100644
--- a/release_docs/INSTALL_VFL
+++ b/release_docs/INSTALL_VFL
@@ -1,6 +1,7 @@
Installation Instructions for HDF5
with Different Virtual File Layer
+Support for SRB and GASS drivers was removed. See RELEASE.txt file
* * *
This file contains installation instructions for HDF5 with certain Virtual File
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 5c9e73c..9f62602 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -81,6 +81,8 @@ New Features
Library:
--------
+ - Retired SRB vfd (--with-srb). Functions H5Pset_fapl_srb and
+ H5Pget_fapl_srb were removed. EIP - 2005/04/07
- Retired GASS vfd (--with-gass). Functions H5Pset_fapl_gass and
H5Pget_fapl_gass are removed too. AKC - 2005/3/3
- Pablo was removed from the source code EIP - 2005/01/21
diff --git a/src/H5F.c b/src/H5F.c
index d683084..9a80f04 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -41,7 +41,6 @@
#include "H5FDmpi.h" /* MPI-based file drivers */
#include "H5FDmulti.h" /*multiple files partitioned by mem usage */
#include "H5FDsec2.h" /*Posix unbuffered I/O */
-#include "H5FDsrb.h" /*SRB I/O */
#include "H5FDstdio.h" /* Standard C buffered I/O */
#include "H5FDstream.h" /*in-memory files streamed via sockets */
diff --git a/src/H5FD.c b/src/H5FD.c
index bbb30c9..d2f95d6 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -41,7 +41,6 @@
#include "H5FDmpi.h" /* MPI-based file drivers */
#include "H5FDmulti.h" /* Usage-partitioned file family */
#include "H5FDsec2.h" /* POSIX unbuffered file I/O */
-#include "H5FDsrb.h" /* Remote access using SRB */
#include "H5FDstdio.h" /* Standard C buffered I/O */
#include "H5FDstream.h" /* In-memory files streamed via sockets */
#include "H5FLprivate.h" /* Free lists */
@@ -165,9 +164,6 @@ H5FD_term_interface(void)
H5FD_log_term();
H5FD_stdio_term();
H5FD_family_term();
-#ifdef H5_HAVE_SRB
- H5FD_srb_term();
-#endif
H5FD_core_term();
H5FD_multi_term();
#ifdef H5_HAVE_PARALLEL
diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c
deleted file mode 100644
index 15faa15..0000000
--- a/src/H5FDsrb.c
+++ /dev/null
@@ -1,843 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois. *
- * All rights reserved. *
- * *
- * This file is part of HDF5. The full HDF5 copyright notice, including *
- * terms governing use, modification, and redistribution, is contained in *
- * the files COPYING and Copyright.html. COPYING can be found at the root *
- * of the source code distribution tree; Copyright.html can be found at the *
- * root level of an installed copy of the electronic HDF5 document set and *
- * is linked from the top-level documents page. It can also be found at *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
- * Wednesday, April 12, 2000
- *
- * Purpose: SRB I/O driver.
- */
-
-/* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC H5FD_srb_init_interface
-
-
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
-#include "H5FDprivate.h" /* File drivers */
-#include "H5FDsrb.h" /* SRB file driver */
-#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property lists */
-
-
-#ifdef H5_HAVE_SRB
-
-/* The driver identification number, initialized at runtime */
-static hid_t H5FD_SRB_g = 0;
-
-/*
- * This driver supports systems that have the lseek64() function by defining
- * some macros here so we don't have to have conditional compilations later
- * throughout the code.
- *
- * file_offset_t: The datatype for file offsets, the second argument of
- * the lseek() or lseek64() call.
- *
- * file_seek: The function which adjusts the current file position,
- * either lseek() or lseek64().
- */
-/* adding for windows NT file system support. */
-
-#ifdef H5_HAVE_LSEEK64
-# define file_offset_t off64_t
-# define file_seek lseek64
-#elif defined (WIN32)
-# ifdef __MWERKS__
-# define file_offset_t off_t
-# define file_seek lseek
-# else /*MSVC*/
-# define file_offset_t __int64
-# define file_seek _lseeki64
-# endif
-#else
-# define file_offset_t off_t
-# define file_seek lseek
-#endif
-
-
-/*
- * These macros check for overflow of various quantities. These macros
- * assume that file_offset_t is signed and haddr_t and size_t are unsigned.
- *
- * ADDR_OVERFLOW: Checks whether a file address of type `haddr_t'
- * is too large to be represented by the second argument
- * of the file seek function.
- *
- * SIZE_OVERFLOW: Checks whether a buffer size of type `hsize_t' is too
- * large to be represented by the `size_t' type.
- *
- * REGION_OVERFLOW: Checks whether an address and size pair describe data
- * which can be addressed entirely by the second
- * argument of the file seek function.
- */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1)
-#define ADDR_OVERFLOW(A) (HADDR_UNDEF==(A) || \
- ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z) (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || \
- sizeof(file_offset_t)<sizeof(size_t) || \
- HADDR_UNDEF==(A)+(Z) || \
- (file_offset_t)((A)+(Z))<(file_offset_t)(A))
-
-
-static H5FD_t *H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id,
- haddr_t maxaddr);
-static herr_t H5FD_srb_close(H5FD_t *_file);
-static herr_t H5FD_srb_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD_srb_get_eoa(H5FD_t *_file);
-static herr_t H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr);
-static haddr_t H5FD_srb_get_eof(H5FD_t *_file);
-static herr_t H5FD_srb_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_srb_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
- size_t size, void *buf);
-static herr_t H5FD_srb_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
- size_t size, const void *buf);
-static herr_t H5FD_srb_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-
-/* The description of a file belonging to this driver. */
-typedef struct H5FD_srb_t {
- H5FD_t pub; /*public stuff, must be first */
- int fd; /*file descriptor */
- srbConn *srb_conn; /*SRB connection handler */
- SRB_Info info; /*file information */
- haddr_t eoa; /*end of allocated region */
- haddr_t eof; /*end of file; current file size*/
- haddr_t pos; /*current file I/O position */
-} H5FD_srb_t;
-
-/* SRB-specific file access properties */
-typedef struct H5FD_srb_fapl_t {
- srbConn *srb_conn; /*SRB connection handler */
- SRB_Info info; /*file information */
-} H5FD_srb_fapl_t;
-
-/* SRB file driver information */
-static const H5FD_class_t H5FD_srb_g = {
- "srb", /*name */
- MAXADDR, /*maxaddr */
- H5F_CLOSE_WEAK, /* fc_degree */
- NULL, /*sb_size */
- NULL, /*sb_encode */
- NULL, /*sb_decode */
- sizeof(H5FD_srb_fapl_t), /*fapl_size */
- NULL, /*fapl_get */
- NULL, /*fapl_copy */
- NULL, /*fapl_free */
- 0, /*dxpl_size */
- NULL, /*dxpl_copy */
- NULL, /*dxpl_free */
- H5FD_srb_open, /*open */
- H5FD_srb_close, /*close */
- NULL, /*cmp */
- H5FD_srb_query, /*query */
- NULL, /*alloc */
- NULL, /*free */
- H5FD_srb_get_eoa, /*get_eoa */
- H5FD_srb_set_eoa, /*set_eoa */
- H5FD_srb_get_eof, /*get_eof */
- H5FD_srb_get_handle, /*get_handle */
- H5FD_srb_read, /*read */
- H5FD_srb_write, /*write */
- H5FD_srb_flush, /*flush */
- NULL, /*lock */
- NULL, /*unlock */
- H5FD_FLMAP_SINGLE /*fl_map */
-};
-
-
-/*--------------------------------------------------------------------------
-NAME
- H5FD_srb_init_interface -- Initialize interface-specific information
-USAGE
- herr_t H5FD_srb_init_interface()
-
-RETURNS
- Non-negative on success/Negative on failure
-DESCRIPTION
- Initializes any interface-specific data or routines. (Just calls
- H5FD_srb_init currently).
-
---------------------------------------------------------------------------*/
-static herr_t
-H5FD_srb_init_interface(void)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_srb_init_interface)
-
- FUNC_LEAVE_NOAPI(H5FD_srb_init())
-} /* H5FD_srb_init_interface() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_init
- *
- * Purpose: Initialize this driver by registering the driver with the
- * library.
- *
- * Return: Success: The driver ID for the srb driver.
- *
- * Failure: Negative.
- *
- * Programmer: Raymond Lu
- * Wednesday, April 12, 2000
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-hid_t
-H5FD_srb_init(void)
-{
- hid_t ret_value=H5FD_SRB_g; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_init, FAIL)
-
- if(H5I_VFL != H5Iget_type(H5FD_SRB_g))
- H5FD_SRB_g = H5FD_register(&H5FD_srb_g,sizeof(H5FD_class_t));
-
- /* Set return value */
- ret_value=H5FD_SRB_g;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*---------------------------------------------------------------------------
- * Function: H5FD_srb_term
- *
- * Purpose: Shut down the VFD
- *
- * Return: <none>
- *
- * Programmer: Quincey Koziol
- * Friday, Jan 30, 2004
- *
- * Modification:
- *
- *---------------------------------------------------------------------------
- */
-void
-H5FD_srb_term(void)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_srb_term)
-
- /* Reset VFL ID */
- H5FD_SRB_g=0;
-
- FUNC_LEAVE_NOAPI_VOID
-} /* end H5FD_srb_term() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Pset_fapl_srb
- *
- * Purpose: Store srb connection(client to server) handler SRB_CONN
- * after connected and user supplied INFO in the file access
- * property list FAPL_ID, which can be used to create or open
- * file.
- *
- * Return: Success: Non-negative
- *
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *
- * Raymond Lu, 2001-10-25
- * Use the new generic property list for argument checking.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info)
-{
- H5FD_srb_fapl_t fa;
- int srb_status;
- H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value;
-
- FUNC_ENTER_API(H5Pset_fapl_srb, FAIL)
- /*NO TRACE*/
-
- if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
-
- /*connect to SRB server */
- fa.srb_conn = clConnect(info.srbHost, info.srbPort, info.srbAuth);
- if((srb_status = clStatus(fa.srb_conn)) != CLI_CONNECTION_OK) {
- fprintf(stderr,"%s",clErrorMessage(fa.srb_conn));
- clFinish(fa.srb_conn);
-
- /*not sure about first 2 parameters. */
- HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "Connection to srbMaster failed.")
- }
-
- fa.info = info;
- ret_value = H5P_set_driver(plist, H5FD_SRB, &fa);
-
-done:
- FUNC_LEAVE_API(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Pget_fapl_srb
- *
- * Purpose: If the file access property list is set to the H5FD_SRB
- * driver then this function returns the srb file INFO.
- *
- * Return: Success: File INFO is returned.
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *
- * Raymond Lu, 2001-10-25
- * Use the new generic property list for checking property list
- * ID.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info/*out*/)
-{
- H5P_genplist_t *plist; /* Property list pointer */
- H5FD_srb_fapl_t *fa;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_API(H5Pget_fapl_srb, FAIL)
- H5TRACE2("e","ix",fapl_id,info);
-
- if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
- if(H5FD_SRB != H5P_get_driver(plist))
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
- if(NULL==(fa=H5P_get_driver_info(plist)))
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
-
- if(info)
- *info = fa->info;
-
-done:
- FUNC_LEAVE_API(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_open
- *
- * Purpose: Opens a file with name NAME. The FLAGS are a bit field with
- * purpose similar to the second argument of open(2) and which
- * are defined in H5Fpublic.h. The file access property list
- * FAPL_ID contains the properties driver properties and MAXADDR
- * is the largest address which this file will be expected to
- * access.
- *
- * Return: Success: A new file pointer.
- *
- * Failure: NULL
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static H5FD_t *
-H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
-{
- struct srbStat srb_stat;
- H5FD_srb_fapl_t *fa=NULL;
- H5FD_srb_fapl_t _fa;
- H5FD_srb_t *file;
- int srb_fid;
- H5P_genplist_t *plist; /* Property list pointer */
- H5FD_t *ret_value;
-
- FUNC_ENTER_NOAPI(H5FD_srb_open, FAIL)
-
- /* Check arguments */
- if (!name || !*name)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
- if (0==maxaddr || HADDR_UNDEF==maxaddr)
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
- if (ADDR_OVERFLOW(maxaddr))
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-
- if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
- if(H5P_FILE_ACCESS_DEFAULT==fapl_id || H5FD_SRB!=H5P_get_driver(plist)) {
- HDmemset((void*)&_fa, 0, sizeof(H5FD_srb_fapl_t));
- fa = &_fa;
- }
- else {
- fa = H5P_get_driver_info(plist);
- assert(fa);
- }
-
- /* When I come down here, the possible flag values and the correct
- * responses are given here :-
- *
- * 1. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_EXCL : The file is
- * a new one. Go ahead and open it with srbObjCreate.
- * 2. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_TRUNC : how do I handle this?
- * srbObjCreate doesn't support truncate while srbObjOpen doesn't
- * support create. Try to call both srbFileCreate and srbFileOpen!
- * 3. H5F_ACC_RDWR | H5F_ACC_TRUNC : Use O_RDWR | O_TRUNC with srbObjOpen.
- * 4. H5F_ACC_RDWR : Use O_RDWR with srbObjOpen.
- * 5. Flag is not set : Use O_RDONLY with srbObjOpen.
- *
- * (In srbObjOpen, O_CREATE is not supported. For file creation, use
- * srbObjCreate.)
- */
-
- if((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) &&
- (flags & H5F_ACC_EXCL))
- srb_fid = srbFileCreate(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, fa->info.mode, fa->info.size);
- else if((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) &&
- (flags & H5F_ACC_TRUNC)) {
- if( (srb_fid = srbFileCreate(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, fa->info.mode, fa->info.size)) < 0 ) {
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDWR|O_TRUNC, fa->info.mode);
- }
- }
- else if((flags & H5F_ACC_RDWR) && (flags & H5F_ACC_TRUNC))
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDWR|O_TRUNC, fa->info.mode);
- else if(flags & H5F_ACC_RDWR)
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDWR, fa->info.mode);
- else
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDONLY, fa->info.mode);
-
-
- if(srb_fid < 0) {
-#ifdef OLD_WAY
- fprintf(stderr, "cannot open file %s\n", name);
- fprintf(stderr,"%s",clErrorMessage(fa->srb_conn));
- clFinish(fa->srb_conn);
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "cannot open file")
-#else /* OLD_WAY */
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, clErrorMessage(fa->srb_conn))
-#endif /* OLD_WAY */
- }
-
- if(srbFileStat(fa->srb_conn, fa->info.storSysType, fa->info.srbHost, name,
- &srb_stat)!=0) {
-#ifdef OLD_WAY
- srbFileClose(fa->srb_conn, srb_fid);
- clFinish(fa->srb_conn);
- HGOTO_ERROR(H5E_IO, H5E_BADFILE, NULL, "SRB file stat failed")
-#else /* OLD_WAY */
- HGOTO_ERROR(H5E_IO, H5E_BADFILE, NULL, "SRB file stat failed")
-#endif /* OLD_WAY */
- }
-
- if (NULL==(file=H5MM_calloc(sizeof(H5FD_srb_t))))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate file struct")
-
- file->fd = srb_fid;
- file->eof = srb_stat.st_size;
- file->pos = HADDR_UNDEF;
- file->srb_conn = fa->srb_conn;
- file->info = fa->info;
-
- /* Set return value */
- ret_value=(H5FD_t*)file;
-
-done:
- if(ret_value==NULL) {
- if(fa!=NULL)
- clFinish(fa->srb_conn);
- if(srb_fid>=0)
- srbFileClose(fa->srb_conn, srb_fid);
- } /* end if */
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_close
- *
- * Purpose: Closes a file and srb connection.
- *
- * Return: Success: Non-negative
- *
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * Modification:
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_close(H5FD_t *_file)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_close, FAIL)
-
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
-
- H5MM_xfree(file);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_query
- *
- * Purpose: Set the flags that this VFL driver is capable of supporting.
- * (listed in H5FDpublic.h)
- *
- * Return: Success: non-negative
- *
- * Failure: negative
- *
- * Programmer: Quincey Koziol
- * Tuesday, September 26, 2000
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */)
-{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_query, FAIL)
-
- /* Set the VFL feature flags that this driver supports */
- if(flags) {
- *flags = 0;
- *flags|=H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
- *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
- }
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_get_eoa
- *
- * Purpose: Gets the end-of-address marker for the file. The EOA marker
- * is the first address past the last byte allocated in the
- * format address space.
- *
- * Return: Success: The end-of-address marker.
- *
- * Failure: HADDR_UNDEF
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_srb_get_eoa(H5FD_t *_file)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- haddr_t ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_get_eoa, HADDR_UNDEF)
-
- /* Set return value */
- ret_value=file->eoa;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_set_eoa
- *
- * Purpose: Set the end-of-address marker for the file. This function is
- * called shortly after an existing HDF5 file is opened in order
- * to tell the driver where the end of the HDF5 data is located.
- *
- * Return: Success: 0
- *
- * Failure: -1
- *
- * Programmer: Robb Matzke
- * Friday, August 6, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_set_eoa, FAIL)
-
- file->eoa = addr;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_get_eof
- *
- * Purpose: Gets the end-of-file marker for the file. The EOF marker
- * is the real size of the file.
- *
- * Return: Success: The end-of-address marker.
- *
- * Failure: HADDR_UNDEF
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_srb_get_eof(H5FD_t *_file)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- haddr_t ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_get_eof, HADDR_UNDEF)
-
- /* Set return value */
- ret_value=file->eof;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_get_handle
- *
- * Purpose: Returns the file handle of SRB file driver.
- *
- * Returns: Non-negative if succeed or negative if fails.
- *
- * Programmer: Raymond Lu
- * Sept. 16, 2002
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- herr_t ret_value = SUCCEED;
-
- FUNC_ENTER_NOAPI(H5FD_srb_get_eof, FAIL)
-
- if(!file_handle)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
-
- *file_handle = &(file->fd);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_read
- *
- * Purpose: Reads SIZE bytes of data from FILE beginning at address ADDR
- * into buffer BUF.
- *
- * Return: Success: Zero. Result is stored in caller-supplied
- * buffer BUF.
- *
- * Failure: -1, Contents of buffer BUF are undefined.
- *
- * Programmer: Raymond Lu
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr,
- size_t size, void *buf)
-{
- H5FD_srb_t *file = (H5FD_srb_t*)_file;
- ssize_t nbytes;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_read, FAIL)
-
- /* Check for overflow conditions */
- if (HADDR_UNDEF==addr)
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined")
- if (REGION_OVERFLOW(addr, size))
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
- if (addr+size>file->eoa)
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
-
- if( addr!=file->pos &&
- srbFileSeek(file->srb_conn, (int)file->fd, (int)addr, SEEK_SET)<0 )
- HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file seek failed")
-
- /*
- * Read data, being careful of interrupted system calls, partial results,
- * and the end of the file.
- */
- while(size>0) {
- if((nbytes=srbFileRead(file->srb_conn, (int)file->fd, (char*)buf, size))<0)
- HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "srb file write failed")
-
- if (0==nbytes) {
- /*end of file but not end of format address space*/
- HDmemset(buf, 0, size);
- size = 0;
- }
- size -= nbytes;
- addr += (haddr_t)nbytes;
- buf = (char*)buf + nbytes;
- }
-
- /* Update current position */
- file->pos = addr;
-
-done:
- if(ret_value<0) {
- /* Reset file position */
- file->pos = HADDR_UNDEF;
-
- /* Close connection, etc. */
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_write
- *
- * Purpose: Writes SIZE bytes of data to FILE beginning at address ADDR
- * from buffer BUF.
- *
- * Return: Success: Zero.
- *
- * Failure: -1
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr,
- size_t size, const void *buf)
-{
- H5FD_srb_t *file = (H5FD_srb_t*)_file;
- ssize_t nbytes;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_write, FAIL)
-
- /* Check for overflow conditions */
- if (HADDR_UNDEF==addr)
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined")
- if (REGION_OVERFLOW(addr, size))
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
- if (addr+size>file->eoa)
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
-
- if( addr!=file->pos &&
- srbFileSeek(file->srb_conn, (int)file->fd, (int)addr, SEEK_SET)<0 )
- HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file seek failed")
-
- while(size>0) {
- if( (nbytes=srbFileWrite(file->srb_conn, (int)file->fd, (char*)buf, size)) < 0 )
- HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "srb file write failed")
-
- size -= nbytes;
- addr += (haddr_t)nbytes;
- buf = (const char*)buf + nbytes;
- }
-
- /* Update current position and eof */
- file->pos = addr;
- if(file->pos > file->eof)
- file->eof = file->pos;
-
-done:
- if(ret_value<0) {
- /* Reset file position */
- file->pos = HADDR_UNDEF;
-
- /* Close connection, etc. */
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_flush
- *
- * Purpose: Makes sure that all data is on disk.
- *
- * Return: Success: Non-negative
- *
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_flush(H5FD_t *_file, hid_t dxpl_id, unsigned UNUSED closing)
-{
- H5FD_srb_t *file = (H5FD_srb_t*)_file;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_flush, FAIL)
-
- if(srbFileSync(file->srb_conn, file->fd) != 0)
- HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file sync failed")
-
-done:
- if(ret_value<0) {
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-#endif /* H5_HAVE_SRB */
diff --git a/src/H5FDsrb.h b/src/H5FDsrb.h
deleted file mode 100644
index 053ca51..0000000
--- a/src/H5FDsrb.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois. *
- * All rights reserved. *
- * *
- * This file is part of HDF5. The full HDF5 copyright notice, including *
- * terms governing use, modification, and redistribution, is contained in *
- * the files COPYING and Copyright.html. COPYING can be found at the root *
- * of the source code distribution tree; Copyright.html can be found at the *
- * root level of an installed copy of the electronic HDF5 document set and *
- * is linked from the top-level documents page. It can also be found at *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
- * Wednesday, April 12, 2000
- * Purpose: The public header file for the SRB driver.
- */
-#ifndef H5FDsrb_H
-#define H5FDsrb_H
-
-#include "H5FDpublic.h"
-#include "H5Ipublic.h"
-
-#ifdef H5_HAVE_SRB
-
-#define H5FD_SRB (H5FD_srb_init())
-
-typedef struct SRB_Info { /* Define the SRB info object. */
- char *srbHost; /* SRB host address of server */
- char *srbPort; /* SRB host port number */
- char *srbAuth; /* SRB Authentication-password */
- int storSysType; /* Storage Type: 0=Unix, 1=UniTree, 2=HPSS,
- * 3=FTP, 4=HTTP */
- int mode; /* File mode-Unix access mode */
- int size; /* File Size-Only valid for HPSS, -1 is default */
-} SRB_Info;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-H5_DLL hid_t H5FD_srb_init(void);
-H5_DLL void H5FD_srb_term(void);
-H5_DLL herr_t H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info);
-H5_DLL herr_t H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info);
-
-#ifdef __cplusplus
-}
-#endif
-
-#else
-#define H5FD_SRB (-1)
-#endif /* H5_HAVE_SRB */
-
-#endif /* H5FDsrb_H */
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 5cfb439..d639e50 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -139,9 +139,6 @@
/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
#undef HAVE_LIBDMALLOC
-/* Define to 1 if you have the `elf' library (-lelf). */
-#undef HAVE_LIBELF
-
/* Define to 1 if you have the `lmpe' library (-llmpe). */
#undef HAVE_LIBLMPE
@@ -169,12 +166,6 @@
/* Define to 1 if you have the `silo' library (-lsilo). */
#undef HAVE_LIBSILO
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to 1 if you have the `SrbClient' library (-lSrbClient). */
-#undef HAVE_LIBSRBCLIENT
-
/* Define to 1 if you have the `sz' library (-lsz). */
#undef HAVE_LIBSZ
@@ -232,12 +223,6 @@
/* Define if `socklen_t' is defined */
#undef HAVE_SOCKLEN_T
-/* Define if the SRB is defined */
-#undef HAVE_SRB
-
-/* Define to 1 if you have the <srbClient.h> header file. */
-#undef HAVE_SRBCLIENT_H
-
/* Define if `struct stat' has the `st_blocks' field */
#undef HAVE_STAT_ST_BLOCKS
diff --git a/src/H5public.h b/src/H5public.h
index 02a7f17..8ca7075 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -56,9 +56,6 @@
#endif
#endif
-#ifdef H5_HAVE_SRB /*for SRB I/O */
-#include <srbClient.h>
-#endif
#include "H5api_adpt.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 1dbdaed..64f39ed 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,11 +34,6 @@ MOSTLYCLEANFILES=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c
# libhdf5.settings is generated during configure. Remove it when distclean.
DISTCLEAN=libhdf5.settings
-# Compile SRB file driver only if SRB is enabled.
-if BUILD_SRB_CONDITIONAL
- SRB_SOURCE=H5FDsrb.c
- SRB_HEADER=H5FDsrb.h
-endif
# library sources
libhdf5_la_SOURCES= H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
@@ -49,7 +44,7 @@ libhdf5_la_SOURCES= H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
H5Defl.c H5Dio.c H5Distore.c H5Dmpio.c H5Dselect.c H5Dtest.c H5E.c H5F.c \
H5Fdbg.c H5FD.c H5FDcore.c \
H5FDfamily.c H5FDfphdf5.c H5FDlog.c H5FDmpi.c H5FDmpio.c \
- H5FDmpiposix.c H5FDmulti.c H5FDsec2.c $(SRB_SOURCE) H5FDstdio.c \
+ H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c \
H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c H5FPserver.c H5FS.c \
H5G.c H5Gent.c H5Gnode.c H5Gstab.c \
H5HG.c H5HGdbg.c H5HL.c H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c H5O.c \
@@ -72,7 +67,7 @@ include_HEADERS =H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5B2public.h \
H5BTpublic.h H5Cpublic.h H5Dpublic.h \
H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDfamily.h \
H5FDfphdf5.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \
- H5FDmulti.h H5FDsec2.h $(SRB_HEADER) H5FDstdio.h H5FDstream.h H5FPpublic.h \
+ H5FDmulti.h H5FDsec2.h H5FDstdio.h H5FDstream.h H5FPpublic.h \
H5Gpublic.h H5HGpublic.h H5HLpublic.h H5Ipublic.h \
H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \
H5SHpublic.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index 80687f6..19547da 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -57,7 +57,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/H5config.h.in \
+DIST_COMMON = $(include_HEADERS) $(srcdir)/H5config.h.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/libhdf5.settings.in $(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
@@ -81,29 +81,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(settingsdir)" \
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libhdf5_la_LIBADD =
-am__libhdf5_la_SOURCES_DIST = H5.c H5A.c H5AC.c H5B.c H5B2.c \
- H5B2cache.c H5B2dbg.c H5B2test.c H5BT.c H5BTbtree2.c \
- H5BTcache.c H5BTdbg.c H5BTtest.c H5C.c H5D.c H5Dcontig.c \
- H5Dcompact.c H5Defl.c H5Dio.c H5Distore.c H5Dmpio.c \
- H5Dselect.c H5Dtest.c H5E.c H5F.c H5Fdbg.c H5FD.c H5FDcore.c \
- H5FDfamily.c H5FDfphdf5.c H5FDlog.c H5FDmpi.c H5FDmpio.c \
- H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDsrb.c H5FDstdio.c \
- H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c H5FPserver.c \
- H5FS.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HGdbg.c \
- H5HL.c H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c H5O.c H5Oattr.c \
- H5Obogus.c H5Ocont.c H5Odtype.c H5Oefl.c H5Ofill.c H5Olayout.c \
- H5Omtime.c H5Oname.c H5Onull.c H5Opline.c H5Osdspace.c \
- H5Oshared.c H5Ostab.c H5P.c H5Pdcpl.c H5Pdxpl.c H5Pfapl.c \
- H5Pfcpl.c H5Ptest.c H5R.c H5RC.c H5RS.c H5S.c H5Sall.c \
- H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c H5Sselect.c \
- H5Stest.c H5SH.c H5SHcache.c H5SHdbg.c H5SL.c H5ST.c H5T.c \
- H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c H5Tconv.c \
- H5Tcset.c H5Tenum.c H5Tfields.c H5Tfixed.c H5Tfloat.c \
- H5Tinit.c H5Tnative.c H5Toffset.c H5Topaque.c H5Torder.c \
- H5Tpad.c H5Tprecis.c H5Tstrpad.c H5Tvlen.c H5TS.c H5V.c H5Z.c \
- H5Zdeflate.c H5Zfletcher32.c H5Znbit.c H5Zshuffle.c H5Zszip.c \
- H5Zscaleoffset.c H5Ztrans.c
-@BUILD_SRB_CONDITIONAL_TRUE@am__objects_1 = H5FDsrb.lo
am_libhdf5_la_OBJECTS = H5.lo H5A.lo H5AC.lo H5B.lo H5B2.lo \
H5B2cache.lo H5B2dbg.lo H5B2test.lo H5BT.lo H5BTbtree2.lo \
H5BTcache.lo H5BTdbg.lo H5BTtest.lo H5C.lo H5D.lo H5Dcontig.lo \
@@ -111,8 +88,8 @@ am_libhdf5_la_OBJECTS = H5.lo H5A.lo H5AC.lo H5B.lo H5B2.lo \
H5Dselect.lo H5Dtest.lo H5E.lo H5F.lo H5Fdbg.lo H5FD.lo \
H5FDcore.lo H5FDfamily.lo H5FDfphdf5.lo H5FDlog.lo H5FDmpi.lo \
H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo \
- $(am__objects_1) H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo \
- H5FP.lo H5FPclient.lo H5FPserver.lo H5FS.lo H5G.lo H5Gent.lo \
+ H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo H5FP.lo \
+ H5FPclient.lo H5FPserver.lo H5FS.lo H5G.lo H5Gent.lo \
H5Gnode.lo H5Gstab.lo H5HG.lo H5HGdbg.lo H5HL.lo H5HLdbg.lo \
H5HP.lo H5I.lo H5MF.lo H5MM.lo H5O.lo H5Oattr.lo H5Obogus.lo \
H5Ocont.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Olayout.lo \
@@ -145,18 +122,9 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libhdf5_la_SOURCES) H5detect.c
-DIST_SOURCES = $(am__libhdf5_la_SOURCES_DIST) H5detect.c
+DIST_SOURCES = $(libhdf5_la_SOURCES) H5detect.c
settingsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(settings_DATA)
-am__include_HEADERS_DIST = H5public.h H5Apublic.h H5ACpublic.h \
- H5Bpublic.h H5B2public.h H5BTpublic.h H5Cpublic.h H5Dpublic.h \
- H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h \
- H5FDfamily.h H5FDfphdf5.h H5FDlog.h H5FDmpi.h H5FDmpio.h \
- H5FDmpiposix.h H5FDmulti.h H5FDsec2.h H5FDsrb.h H5FDstdio.h \
- H5FDstream.h H5FPpublic.h H5Gpublic.h H5HGpublic.h \
- H5HLpublic.h H5Ipublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h \
- H5Rpublic.h H5Spublic.h H5SHpublic.h H5Tpublic.h H5Zpublic.h \
- H5pubconf.h hdf5.h H5api_adpt.h
includeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(include_HEADERS)
ETAGS = etags
@@ -189,8 +157,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -282,11 +248,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
@@ -382,10 +346,6 @@ MOSTLYCLEANFILES = H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.
# libhdf5.settings is generated during configure. Remove it when distclean.
DISTCLEAN = libhdf5.settings
-# Compile SRB file driver only if SRB is enabled.
-@BUILD_SRB_CONDITIONAL_TRUE@SRB_SOURCE = H5FDsrb.c
-@BUILD_SRB_CONDITIONAL_TRUE@SRB_HEADER = H5FDsrb.h
-
# library sources
libhdf5_la_SOURCES = H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
H5B2test.c H5BT.c H5BTbtree2.c H5BTcache.c H5BTdbg.c H5BTtest.c H5C.c \
@@ -395,7 +355,7 @@ libhdf5_la_SOURCES = H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
H5Defl.c H5Dio.c H5Distore.c H5Dmpio.c H5Dselect.c H5Dtest.c H5E.c H5F.c \
H5Fdbg.c H5FD.c H5FDcore.c \
H5FDfamily.c H5FDfphdf5.c H5FDlog.c H5FDmpi.c H5FDmpio.c \
- H5FDmpiposix.c H5FDmulti.c H5FDsec2.c $(SRB_SOURCE) H5FDstdio.c \
+ H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c \
H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c H5FPserver.c H5FS.c \
H5G.c H5Gent.c H5Gnode.c H5Gstab.c \
H5HG.c H5HGdbg.c H5HL.c H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c H5O.c \
@@ -418,7 +378,7 @@ include_HEADERS = H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5B2public.h \
H5BTpublic.h H5Cpublic.h H5Dpublic.h \
H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDfamily.h \
H5FDfphdf5.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \
- H5FDmulti.h H5FDsec2.h $(SRB_HEADER) H5FDstdio.h H5FDstream.h H5FPpublic.h \
+ H5FDmulti.h H5FDsec2.h H5FDstdio.h H5FDstream.h H5FPpublic.h \
H5Gpublic.h H5HGpublic.h H5HLpublic.h H5Ipublic.h \
H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \
H5SHpublic.h \
@@ -588,7 +548,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpiposix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmulti.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDsec2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDsrb.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstdio.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FL.Plo@am__quote@
diff --git a/src/hdf5.h b/src/hdf5.h
index 3b6da96..bce01c5 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -48,9 +48,6 @@
#include "H5FDmpi.h" /* MPI-based file drivers */
#include "H5FDmulti.h" /* Usage-partitioned file family */
#include "H5FDsec2.h" /* POSIX unbuffered file I/O */
-#ifdef H5_HAVE_LIBSRBCLIENT
-#include "H5FDsrb.h" /* Remote access using SRB */
-#endif
#include "H5FDstdio.h" /* Standard C buffered I/O */
#include "H5FDstream.h" /* In-memory files streamed via sockets */
diff --git a/src/hdf5.lnt b/src/hdf5.lnt
index ecb9964..ed623b4 100755
--- a/src/hdf5.lnt
+++ b/src/hdf5.lnt
@@ -94,6 +94,5 @@
H5FDfphdf5.c
H5FDmpio.c
H5FDmpiposix.c
- H5FDsrb.c
H5FDstream.c
*/
diff --git a/test/Makefile.am b/test/Makefile.am
index 21c9b80..ed903c8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,10 +26,6 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src
TEST_SCRIPT = $(top_srcdir)/test/testerror.sh
check_SCRIPTS = $(TEST_SCRIPT)
-# Build and run SRB tests only if SRB driver is enabled.
-if BUILD_SRB_CONDITIONAL
- SRB_TESTS=srb_write srb_append srb_read
-endif
# These are our main targets. They should be listed in the order to be
# executed, generally most specific tests to least specific tests.
@@ -38,8 +34,7 @@ TEST_PROG=testhdf5 lheap ohdr stab gheap cache btree2 blocktrack sheap \
dtypes dsets cmpd_dset extend external links unlink big mtime \
fillval mount flush1 flush2 enum \
set_extent ttsafe stream_test \
- getname file_handle ntypes dangle dtransform filename reserved \
- $(SRB_TESTS)
+ getname file_handle ntypes dangle dtransform filename reserved
# List programs to be built when testing here. error_test and err_compat are
# built at the same time as the other tests, but executed by testerror.sh.
diff --git a/test/Makefile.in b/test/Makefile.in
index 51a550c..c6623ff 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -29,7 +29,7 @@
#
# HDF5 Library Test Makefile(.in)
#
-SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c btree2.c cache.c cmpd_dset.c dangle.c dsets.c dt_atomic.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c file_handle.c filename.c fillval.c flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c set_extent.c sheap.c srb_append.c srb_read.c srb_write.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
+SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c btree2.c cache.c cmpd_dset.c dangle.c dsets.c dt_atomic.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c file_handle.c filename.c fillval.c flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c set_extent.c sheap.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -56,7 +56,7 @@ host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
-check_PROGRAMS = $(am__EXEEXT_2) error_test$(EXEEXT) \
+check_PROGRAMS = $(am__EXEEXT_1) error_test$(EXEEXT) \
err_compat$(EXEEXT) testmeta$(EXEEXT)
subdir = test
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -70,10 +70,7 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la
libh5test_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libh5test_la_OBJECTS = h5test.lo testframe.lo
libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS)
-@BUILD_SRB_CONDITIONAL_TRUE@am__EXEEXT_1 = srb_write$(EXEEXT) \
-@BUILD_SRB_CONDITIONAL_TRUE@ srb_append$(EXEEXT) \
-@BUILD_SRB_CONDITIONAL_TRUE@ srb_read$(EXEEXT)
-am__EXEEXT_2 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
+am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) btree2$(EXEEXT) \
blocktrack$(EXEEXT) sheap$(EXEEXT) hyperslab$(EXEEXT) \
istore$(EXEEXT) bittests$(EXEEXT) dt_atomic$(EXEEXT) \
@@ -84,7 +81,7 @@ am__EXEEXT_2 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
set_extent$(EXEEXT) ttsafe$(EXEEXT) stream_test$(EXEEXT) \
getname$(EXEEXT) file_handle$(EXEEXT) ntypes$(EXEEXT) \
dangle$(EXEEXT) dtransform$(EXEEXT) filename$(EXEEXT) \
- reserved$(EXEEXT) $(am__EXEEXT_1)
+ reserved$(EXEEXT)
big_SOURCES = big.c
big_OBJECTS = big.$(OBJEXT)
big_LDADD = $(LDADD)
@@ -221,18 +218,6 @@ sheap_SOURCES = sheap.c
sheap_OBJECTS = sheap.$(OBJEXT)
sheap_LDADD = $(LDADD)
sheap_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
-srb_append_SOURCES = srb_append.c
-srb_append_OBJECTS = srb_append.$(OBJEXT)
-srb_append_LDADD = $(LDADD)
-srb_append_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
-srb_read_SOURCES = srb_read.c
-srb_read_OBJECTS = srb_read.$(OBJEXT)
-srb_read_LDADD = $(LDADD)
-srb_read_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
-srb_write_SOURCES = srb_write.c
-srb_write_OBJECTS = srb_write.$(OBJEXT)
-srb_write_LDADD = $(LDADD)
-srb_write_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
stab_SOURCES = stab.c
stab_OBJECTS = stab.$(OBJEXT)
stab_LDADD = $(LDADD)
@@ -282,18 +267,16 @@ SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c \
extend.c external.c file_handle.c filename.c fillval.c \
flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c \
lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c \
- set_extent.c sheap.c srb_append.c srb_read.c srb_write.c \
- stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c \
- $(ttsafe_SOURCES) unlink.c
+ set_extent.c sheap.c stab.c stream_test.c $(testhdf5_SOURCES) \
+ testmeta.c $(ttsafe_SOURCES) unlink.c
DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c \
btree2.c cache.c cmpd_dset.c dangle.c dsets.c dt_atomic.c \
dtransform.c dtypes.c enum.c err_compat.c error_test.c \
extend.c external.c file_handle.c filename.c fillval.c \
flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c \
lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c \
- set_extent.c sheap.c srb_append.c srb_read.c srb_write.c \
- stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c \
- $(ttsafe_SOURCES) unlink.c
+ set_extent.c sheap.c stab.c stream_test.c $(testhdf5_SOURCES) \
+ testmeta.c $(ttsafe_SOURCES) unlink.c
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -324,8 +307,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -417,11 +398,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
@@ -513,9 +492,6 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
TEST_SCRIPT = $(top_srcdir)/test/testerror.sh
check_SCRIPTS = $(TEST_SCRIPT)
-# Build and run SRB tests only if SRB driver is enabled.
-@BUILD_SRB_CONDITIONAL_TRUE@SRB_TESTS = srb_write srb_append srb_read
-
# These are our main targets. They should be listed in the order to be
# executed, generally most specific tests to least specific tests.
TEST_PROG = testhdf5 lheap ohdr stab gheap cache btree2 blocktrack sheap \
@@ -523,8 +499,7 @@ TEST_PROG = testhdf5 lheap ohdr stab gheap cache btree2 blocktrack sheap \
dtypes dsets cmpd_dset extend external links unlink big mtime \
fillval mount flush1 flush2 enum \
set_extent ttsafe stream_test \
- getname file_handle ntypes dangle dtransform filename reserved \
- $(SRB_TESTS)
+ getname file_handle ntypes dangle dtransform filename reserved
# The libh5test.a library provides common support code for the tests.
@@ -738,15 +713,6 @@ set_extent$(EXEEXT): $(set_extent_OBJECTS) $(set_extent_DEPENDENCIES)
sheap$(EXEEXT): $(sheap_OBJECTS) $(sheap_DEPENDENCIES)
@rm -f sheap$(EXEEXT)
$(LINK) $(sheap_LDFLAGS) $(sheap_OBJECTS) $(sheap_LDADD) $(LIBS)
-srb_append$(EXEEXT): $(srb_append_OBJECTS) $(srb_append_DEPENDENCIES)
- @rm -f srb_append$(EXEEXT)
- $(LINK) $(srb_append_LDFLAGS) $(srb_append_OBJECTS) $(srb_append_LDADD) $(LIBS)
-srb_read$(EXEEXT): $(srb_read_OBJECTS) $(srb_read_DEPENDENCIES)
- @rm -f srb_read$(EXEEXT)
- $(LINK) $(srb_read_LDFLAGS) $(srb_read_OBJECTS) $(srb_read_LDADD) $(LIBS)
-srb_write$(EXEEXT): $(srb_write_OBJECTS) $(srb_write_DEPENDENCIES)
- @rm -f srb_write$(EXEEXT)
- $(LINK) $(srb_write_LDFLAGS) $(srb_write_OBJECTS) $(srb_write_LDADD) $(LIBS)
stab$(EXEEXT): $(stab_OBJECTS) $(stab_DEPENDENCIES)
@rm -f stab$(EXEEXT)
$(LINK) $(stab_LDFLAGS) $(stab_OBJECTS) $(stab_LDADD) $(LIBS)
@@ -807,9 +773,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reserved.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_extent.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sheap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srb_append.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srb_read.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srb_write.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stab.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tarray.Po@am__quote@
diff --git a/test/srb_append.c b/test/srb_append.c
deleted file mode 100644
index e752b4a..0000000
--- a/test/srb_append.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois. *
- * All rights reserved. *
- * *
- * This file is part of HDF5. The full HDF5 copyright notice, including *
- * terms governing use, modification, and redistribution, is contained in *
- * the files COPYING and Copyright.html. COPYING can be found at the root *
- * of the source code distribution tree; Copyright.html can be found at the *
- * root level of an installed copy of the electronic HDF5 document set and *
- * is linked from the top-level documents page. It can also be found at *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
- * April 14, 2000
- *
- * Purpose: Test HDF-SRB if it is configured and compiled. Append an
- * integer dataset to an existent HDF5 file with an integer array
- * on SRB server.
- *
- * Usage: The HDF5 is built on the top of SRB. So you just need to
- * activate a connection to SRB server by calling function
- * H5Pset_fapl_srb()(after creating file property list by calling
- * H5Pcreate()). All server information is passed in through its
- * parameter SRB_Info(a structure). Its fields are
- * char *srbHost: SRB host address of server. If the input is
- * NULL, it will use the environment varible "srbHost" if
- * it is defined. If it is not defined, the
- * ~/.srb/.MdasEnd file will be checked next. If not, it
- * will use the hostname of the client machine.
- * char *srbPort: SRB host port number of server. If the
- * input value is NULL, it will use the env variable
- * "srbPort" if it is defined. If not, it defaults to
- * 5558.
- * char *srbAuth: SRB Authentication-password. It is used to
- * define password for MDAS or SEA authentication.
- * For SEA authentication, this is the password used by
- * the SEA library to decrypt the encrypted private key
- * stored in the file ~/.SEAuuuuu@ddddd(where uuuuu is
- * the user ID and ddddd is the user domain name). This
- * input is not needed if an unencrypted private key is
- * available in the /tmp directory(generated using the
- * 'seaauth auto' command). To provide additional
- * flexibility, a client may also use the environment
- * variable "srbAuth" to specify the password. A client
- * may also supply the password in the ~/.srb/.MdasAuth
- * file. If a client uses more than one method to specfy
- * the password, the value given in this function call
- * will take precedent, then the environment variable
- * "srbAuth", and lastly, the ~/.srb/.MdasAuth file.
- * int storSysType: Storage system type on SRB server.
- * 0=Unix, 1=UniTree, 2=HPSS, 3=FTP, 4=HTTP
- * int mode: File access mode, same definition with Unix.
- * int size: File Size, only valid for HPSS, -1 is default
- *
- * Then you can open an HDF5 file by calling H5Fopen(). When
- * you pass in the file name, it has to be file name with an
- * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your
- * home directory is possibly in /projects/mdas/srb/SRBVault/.
- */
-#include "h5test.h"
-
-#ifndef H5_HAVE_SRB
-int main(void)
-{
- printf("Test skipped because SRB driver not available\n");
- return 0;
-}
-#else
-
-#define fileName "/projects/mdas/srb/SRBVault/slu.ncsa/a.h5"
-#define DATASETNAME "Int1Array"
-#define NX 5 /* dataset dimensions */
-#define NY 6
-#define RANK 2
-
-int main(void)
-{
- SRB_Info srb_info={ NULL, /* Use the server name in ~/.srb/MdasEnv */
- NULL, /* Use the server port number in
- * ~/.srb/MdasEnv */
- NULL, /* Use the password in ~/.srb/MdasAuth */
- 0, /* Using Unix storage system. */
- 0600, /* Open file for read and write for owner */
- -1 /* default */
- };
- hid_t fapl =-1, file;
- hid_t dataspace, datatype, dataset;
- hsize_t dimsf[2];
-
- herr_t status = 0;
- int data[NX][NY]; /* data to write */
- int i, j;
-
- /*
- * Data and output buffer initialization.
- */
- for (j = 0; j < NX; j++) {
- for (i = 0; i < NY; i++)
- data[j][i] = i*i + j*j;
- }
- /*
- * 0 1 4 9 16 25
- * 1 2 5 10 17 26
- * 4 5 8 13 20 29
- * 9 10 13 18 25 34
- * 16 17 20 25 32 41
- */
-
- /* Create access property list and set the driver to SRB */
- fapl = H5Pcreate (H5P_FILE_ACCESS);
- if (fapl < 0) {
- printf (" H5Pcreate failed. \n");
- return -1;
- }
- status = H5Pset_fapl_srb (fapl, srb_info);
- if (status < 0) {
- printf ("H5Pset_fapl_srb failed. \n");
- return -1;
- }
-
- /*
- * Open an existing file using H5F_ACC_RDWR access,
- * and srb file access properties.
- */
- file = H5Fopen(fileName, H5F_ACC_RDWR, fapl);
- if (file < 0) {
- printf ("H5Fopen failed. \n");
- return -1;
- }
-
- /*
- * Describe the size of the array and create the data space for fixed
- * size dataset.
- */
- dimsf[0] = NX;
- dimsf[1] = NY;
- dataspace = H5Screate_simple(RANK, dimsf, NULL);
- if (dataspace < 0) {
- printf ("H5Screate failed. \n");
- return -1;
- }
-
- /*
- * Define datatype for the data in the file.
- * We will store little endian INT numbers.
- */
- datatype = H5Tcopy(H5T_NATIVE_INT);
- if (datatype < 0) {
- printf ("H5Tcopy failed. \n");
- return -1;
- }
-
- status = H5Tset_order(datatype, H5T_ORDER_LE);
- if (status < 0) {
- printf ("H5Tset_order failed. \n");
- return -1;
- }
-
- /*
- * Create a new dataset within the file using defined dataspace and
- * datatype and default dataset creation properties.
- */
- dataset = H5Dcreate(file, DATASETNAME, datatype, dataspace,
- H5P_DEFAULT);
- if (dataset < 0) {
- printf ("H5Dcreate failed. \n");
- return -1;
- }
-
- /*
- * Write the data to the dataset using default transfer properties.
- */
- status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
- H5P_DEFAULT, data);
- if (status < 0) {
- printf ("H5Dwrite failed. \n");
- return -1;
- }
-
- /*
- * Close/release resources.
- */
- H5Sclose(dataspace);
- H5Tclose(datatype);
- H5Dclose(dataset);
- H5Fclose(file);
- H5Pclose(fapl);
-
- printf("Test finished!\n");
- return 0;
-}
-
-#endif
diff --git a/test/srb_read.c b/test/srb_read.c
deleted file mode 100644
index 767812c..0000000
--- a/test/srb_read.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois. *
- * All rights reserved. *
- * *
- * This file is part of HDF5. The full HDF5 copyright notice, including *
- * terms governing use, modification, and redistribution, is contained in *
- * the files COPYING and Copyright.html. COPYING can be found at the root *
- * of the source code distribution tree; Copyright.html can be found at the *
- * root level of an installed copy of the electronic HDF5 document set and *
- * is linked from the top-level documents page. It can also be found at *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
- * April 14, 2000
- *
- * Purpose: Test HDF-SRB if it is configured and compiled. Read a chunk of
- * dataset of an HDF5 file with an integer array on SRB server,
- * using hyperslab.
- * Usage: The HDF5 is built on the top of SRB. So you just need to
- * activate a connection to SRB server by calling function
- * H5Pset_fapl_srb()(after creating file property list by calling
- * H5Pcreate()). All server information is passed in through its
- * parameter SRB_Info(a structure). Its fields are
- * char *srbHost: SRB host address of server. If the input is
- * NULL, it will use the environment varible "srbHost" if
- * it is defined. If it is not defined, the
- * ~/.srb/.MdasEnd file will be checked next. If not, it
- * will use the hostname of the client machine.
- * char *srbPort: SRB host port number of server. If the
- * input value is NULL, it will use the env variable
- * "srbPort" if it is defined. If not, it defaults to
- * 5558.
- * char *srbAuth: SRB Authentication-password. It is used to
- * define password for MDAS or SEA authentication.
- * For SEA authentication, this is the password used by
- * the SEA library to decrypt the encrypted private key
- * stored in the file ~/.SEAuuuuu@ddddd(where uuuuu is
- * the user ID and ddddd is the user domain name). This
- * input is not needed if an unencrypted private key is
- * available in the /tmp directory(generated using the
- * 'seaauth auto' command). To provide additional
- * flexibility, a client may also use the environment
- * variable "srbAuth" to specify the password. A client
- * may also supply the password in the ~/.srb/.MdasAuth
- * file. If a client uses more than one method to specfy
- * the password, the value given in this function call
- * will take precedent, then the environment variable
- * "srbAuth", and lastly, the ~/.srb/.MdasAuth file.
- * int storSysType: Storage system type on SRB server.
- * 0=Unix, 1=UniTree, 2=HPSS, 3=FTP, 4=HTTP
- * int mode: File access mode, same definition with Unix.
- * int size: File Size, only valid for HPSS, -1 is default
- *
- * Then you can open an HDF5 file by calling H5Fopen(). When
- * you pass in the file name, it has to be file name with an
- * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your
- * home directory is possibly in /projects/mdas/srb/SRBVault/.
- */
-#include "h5test.h"
-
-#ifndef H5_HAVE_SRB
-int main(void)
-{
- printf("Test skipped because SRB driver not available\n");
- return 0;
-}
-#else
-
-#define fileName "/projects/mdas/srb/SRBVault/slu.ncsa/a.h5"
-#define DATASETNAME "IntArray"
-#define NX_SUB 3 /* hyperslab dimensions */
-#define NY_SUB 4
-#define NX 7 /* output buffer dimensions */
-#define NY 7
-#define NZ 3
-#define RANK 2
-#define RANK_OUT 3
-
-int main(void)
-{
- hid_t fapl=-1, fid = -1, dataset;
- hid_t datatype, dataspace;
- hid_t memspace;
- H5T_class_t class; /* data type class */
- H5T_order_t order; /* data order */
- size_t size; /*
- * size of the data element
- * stored in file
- */
- hsize_t dimsm[3]; /* memory space dimensions */
- hsize_t dims_out[2]; /* dataset dimensions */
- herr_t status;
-
- int data_out[NX][NY][NZ ]; /* output buffer */
-
- hsize_t count[2]; /* size of the hyperslab in the file */
- hssize_t offset[2]; /* hyperslab offset in the file */
- hsize_t count_out[3]; /* size of the hyperslab in memory */
- hssize_t offset_out[3]; /* hyperslab offset in memory */
- int i, j, k, status_n, rank;
- SRB_Info srb_info={ NULL, /* Use host name in ~/.srb/.MdasEnv */
- NULL, /* Use environment variable "srbPort" */
- NULL, /* Use password in ~/.srb/.MdasEnv */
- 0, /* Use Unix storage system. */
- 0600, /* File was created for read and write for
- * owner */
- -1 /* default */
- };
-
- for (j = 0; j < NX; j++) {
- for (i = 0; i < NY; i++) {
- for (k = 0; k < NZ ; k++)
- data_out[j][i][k] = 0;
- }
- }
-
- fapl = H5Pcreate(H5P_FILE_ACCESS);
- if (fapl < 0) {
- printf (" H5Pcreate failed. \n");
- return -1;
- }
-
- status = H5Pset_fapl_srb(fapl, srb_info);
- if (status < 0) {
- printf ("H5Pset_fapl_srb failed. \n");
- return -1;
- }
-
- fid = H5Fopen(fileName, H5F_ACC_RDONLY, fapl);
- if (fid < 0) {
- printf ("H5Fopen failed. \n");
- return -1;
- }
- dataset = H5Dopen(fid, DATASETNAME);
- if(dataset<0) {
- printf ("H5Dopen failed. \n");
- return -1;
- }
- /*
- * Get datatype and dataspace handles and then query
- * dataset class, order, size, rank and dimensions.
- */
- datatype = H5Dget_type(dataset); /* datatype handle */
- class = H5Tget_class(datatype);
- if (class == H5T_INTEGER) printf("Data set has INTEGER type \n");
- order = H5Tget_order(datatype);
- if (order == H5T_ORDER_LE) printf("Little endian order \n");
-
- size = H5Tget_size(datatype);
- printf(" Data size is %d \n", size);
-
- dataspace = H5Dget_space(dataset); /* dataspace handle */
- rank = H5Sget_simple_extent_ndims(dataspace);
- status_n = H5Sget_simple_extent_dims(dataspace, dims_out, NULL);
- printf("rank %d, dimensions %lu x %lu \n", rank,
- (unsigned long)(dims_out[0]), (unsigned long)(dims_out[1]));
-
- /*
- * Define hyperslab in the dataset.
- */
- offset[0] = 1;
- offset[1] = 2;
- count[0] = NX_SUB;
- count[1] = NY_SUB;
- status = H5Sselect_hyperslab(dataspace, H5S_SELECT_SET, offset, NULL,
- count, NULL);
-
- /*
- * Define the memory dataspace.
- */
- dimsm[0] = NX;
- dimsm[1] = NY;
- dimsm[2] = NZ ;
- memspace = H5Screate_simple(RANK_OUT,dimsm,NULL);
-
- /*
- * Define memory hyperslab.
- */
- offset_out[0] = 3;
- offset_out[1] = 0;
- offset_out[2] = 0;
- count_out[0] = NX_SUB;
- count_out[1] = NY_SUB;
- count_out[2] = 1;
- status = H5Sselect_hyperslab(memspace, H5S_SELECT_SET, offset_out, NULL,
- count_out, NULL);
-
- /*
- * Read data from hyperslab in the file into the hyperslab in
- * memory and display.
- */
- status = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace,
- H5P_DEFAULT, data_out);
- for (j = 0; j < NX; j++) {
- for (i = 0; i < NY; i++) printf("%d ", data_out[j][i][0]);
- printf("\n");
- }
- /*
- * 0 0 0 0 0 0 0
- * 0 0 0 0 0 0 0
- * 0 0 0 0 0 0 0
- * 3 4 5 6 0 0 0
- * 4 5 6 7 0 0 0
- * 5 6 7 8 0 0 0
- * 0 0 0 0 0 0 0
- */
-
- /*
- * Close/release resources.
- */
- H5Tclose(datatype);
- H5Dclose(dataset);
- H5Sclose(dataspace);
- H5Sclose(memspace);
- H5Fclose(fid);
- H5Pclose(fapl);
-
- printf("Test finished!\n");
- return 0;
-}
-
-#endif
diff --git a/test/srb_write.c b/test/srb_write.c
deleted file mode 100644
index b0629a8..0000000
--- a/test/srb_write.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois. *
- * All rights reserved. *
- * *
- * This file is part of HDF5. The full HDF5 copyright notice, including *
- * terms governing use, modification, and redistribution, is contained in *
- * the files COPYING and Copyright.html. COPYING can be found at the root *
- * of the source code distribution tree; Copyright.html can be found at the *
- * root level of an installed copy of the electronic HDF5 document set and *
- * is linked from the top-level documents page. It can also be found at *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
- * April 14, 2000
- *
- * Purpose: Test HDF-SRB if it is configured and compiled. Write an HDF5
- * file with an integer array to SRB server.
- *
- * Usage: The HDF5 is built on the top of SRB. So you just need to
- * activate a connection to SRB server by calling function
- * H5Pset_fapl_srb()(after creating file property list by calling
- * H5Pcreate()). All server information is passed in through its
- * parameter SRB_Info(a structure). Its fields are
- * char *srbHost: SRB host address of server. If the input is
- * NULL, it will use the environment varible "srbHost" if
- * it is defined. If it is not defined, the
- * ~/.srb/.MdasEnd file will be checked next. If not, it
- * will use the hostname of the client machine.
- * char *srbPort: SRB host port number of server. If the
- * input value is NULL, it will use the env variable
- * "srbPort" if it is defined. If not, it defaults to
- * 5558.
- * char *srbAuth: SRB Authentication-password. It is used to
- * define password for MDAS or SEA authentication.
- * For SEA authentication, this is the password used by
- * the SEA library to decrypt the encrypted private key
- * stored in the file ~/.SEAuuuuu@ddddd(where uuuuu is
- * the user ID and ddddd is the user domain name). This
- * input is not needed if an unencrypted private key is
- * available in the /tmp directory(generated using the
- * 'seaauth auto' command). To provide additional
- * flexibility, a client may also use the environment
- * variable "srbAuth" to specify the password. A client
- * may also supply the password in the ~/.srb/.MdasAuth
- * file. If a client uses more than one method to specfy
- * the password, the value given in this function call
- * will take precedent, then the environment variable
- * "srbAuth", and lastly, the ~/.srb/.MdasAuth file.
- * int storSysType: Storage system type on SRB server.
- * 0=Unix, 1=UniTree, 2=HPSS, 3=FTP, 4=HTTP
- * int mode: File access mode, same definition with Unix.
- * int size: File Size, only valid for HPSS, -1 is default
- *
- * Then you can create an HDF5 file by calling H5Fcreate(). When
- * you pass in the file name, it has to be file name with an
- * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your
- * home directory is possibly in /projects/mdas/srb/SRBVault/.
- */
-
-#include "h5test.h"
-
-#ifndef H5_HAVE_SRB
-int main(void)
-{
- printf("Test skipped because SRB driver not available\n");
- return 0;
-}
-#else
-
-#define fileName "/projects/mdas/srb/SRBVault/slu.ncsa/a.h5"
-#define DATASETNAME "IntArray"
-#define NX 5 /* dataset dimensions */
-#define NY 6
-#define RANK 2
-
-
-int main(void)
-{
- hid_t fapl=-1, fid = -1;
- hid_t dataspace, datatype, dataset;
- hsize_t dimsf[2];
- herr_t status = 0;
- int data[NX][NY]; /* data to write */
- int i, j;
- SRB_Info srb_info={ "ghidorah.sdsc.edu", /* Using SDSC SRB server,
- * don't append port number. */
- NULL, /* SRB host default port number*/
- NULL, /* SRB Authentication-password,
- * using the one in
- * ~/.srb/.MdasAuth */
- 0, /* Unix storage system. */
- 0600, /* Read and write only for
- * owner */
- -1 /* -1 is default. */
- };
-
- /*
- * Data and output buffer initialization.
- */
- for (j = 0; j < NX; j++) {
- for (i = 0; i < NY; i++)
- data[j][i] = i + j;
- }
- /*
- * 0 1 2 3 4 5
- * 1 2 3 4 5 6
- * 2 3 4 5 6 7
- * 3 4 5 6 7 8
- * 4 5 6 7 8 9
- */
-
- fapl = H5Pcreate(H5P_FILE_ACCESS);
- if (fapl < 0) {
- printf (" H5Pcreate failed. \n");
- return -1;
- }
-
- status = H5Pset_fapl_srb(fapl, srb_info);
- if (status < 0) {
- printf ("H5Pset_fapl_srb failed. \n");
- return -1;
- }
-
- fid = H5Fcreate(fileName, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
- /*fid = H5Fcreate(fileName, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);*/
- if (fid < 0) {
- printf ("H5Fcreate failed. \n");
- return -1;
- }
-
- /*
- * Describe the size of the array and create the data space for fixed
- * size dataset.
- */
- dimsf[0] = NX;
- dimsf[1] = NY;
- dataspace = H5Screate_simple(RANK, dimsf, NULL);
- if (dataspace < 0) {
- printf ("H5Screate failed. \n");
- return -1;
- }
-
- /*
- * Define datatype for the data in the file.
- * We will store little endian INT numbers.
- */
- datatype = H5Tcopy(H5T_NATIVE_INT);
- if (datatype < 0) {
- printf ("H5Tcopy failed. \n");
- return -1;
- }
-
- status = H5Tset_order(datatype, H5T_ORDER_LE);
- if (status < 0) {
- printf ("H5Tset_order failed. \n");
- return -1;
- }
- /*
- * Create a new dataset within the file using defined dataspace and
- * datatype and default dataset creation properties.
- */
- dataset = H5Dcreate(fid, DATASETNAME, datatype, dataspace,
- H5P_DEFAULT);
- if (dataset < 0) {
- printf ("H5Dcreate failed. \n");
- return -1;
- }
-
-
- /*
- * Write the data to the dataset using default transfer properties.
- */
- status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
- H5P_DEFAULT, data);
- if (status < 0) {
- printf ("H5Dwrite failed. \n");
- return -1;
- }
-
- H5Sclose(dataspace);
- H5Tclose(datatype);
- H5Dclose(dataset);
- H5Fclose(fid);
- H5Pclose(fapl);
-
- printf("Test finished!\n");
- return 0;
-}
-
-#endif
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 06804ee..5c5c790 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -125,8 +125,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -218,11 +216,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 1e9d780..3693e3b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -101,8 +101,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -194,11 +192,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 0dfb102..5e742e5 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -124,8 +124,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -217,11 +215,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 6ca4205..6188d0b 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -132,8 +132,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -225,11 +223,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 03fcd31..7f91fe3 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -125,8 +125,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -218,11 +216,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 59b8ff8..4aff9dc 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -125,8 +125,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -218,11 +216,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index caecd36..0505d86 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -120,8 +120,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -213,11 +211,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index a503b5c..f868ebd 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -118,8 +118,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -211,11 +209,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 1cea2dc..75c0e42 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -140,8 +140,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -233,11 +231,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 8368499..0e9982e 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -122,8 +122,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -215,11 +213,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index e17e241..35481c4 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -130,8 +130,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -223,11 +221,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@