[svn-r22908] Reverted changes in revision 22819

Tested with h5committest on jam, koala and ostrich.

6 files changed, 0 insertions, 14 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 888736a..806eb30 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -219,7 +219,6 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
-H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -234,7 +233,6 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 5da455b..06c2632 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -190,7 +190,6 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
-H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -205,7 +204,6 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 06314ab..572f081 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -307,7 +307,6 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
-H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -322,7 +321,6 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index 4985650..2d7b5b4 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -98,10 +98,6 @@ FFLAGS="${HDF5_FFLAGS:-$FFLAGSBASE}"
 LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
 LIBS="${HDF5_LIBS:-$LIBSBASE}"
 
-# If static was disabled, @HDF5_USE_SHLIB@ will be yes.  In that case
-# HDF5_USE_SHLIB should be set to yes because there are no static
-# lib files.
-HDF5_USE_SHLIB="@HDF5_USE_SHLIB@"
 USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
 
 usage() {
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 43df446..b9f05e3 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -292,7 +292,6 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
-H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -307,7 +306,6 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 5faf18c..1cbc87e 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -217,7 +217,6 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
-H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -232,7 +231,6 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
-HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@