summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2012-10-16 21:38:58 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2012-10-16 21:38:58 (GMT)
commit33504deb83ded74816f659887405aecef07718bf (patch)
tree9c9b45fa673d68ea5da36848c3e88cb08d0af446 /c++
parent6e6ba4f06408c6642b6a8364408af4a6c16d54bd (diff)
downloadhdf5-33504deb83ded74816f659887405aecef07718bf.zip
hdf5-33504deb83ded74816f659887405aecef07718bf.tar.gz
hdf5-33504deb83ded74816f659887405aecef07718bf.tar.bz2
[svn-r22908] Reverted changes in revision 22819
Tested with h5committest on jam, koala and ostrich.
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.in2
-rw-r--r--c++/examples/Makefile.in2
-rw-r--r--c++/src/Makefile.in2
-rw-r--r--c++/src/h5c++.in4
-rw-r--r--c++/test/Makefile.in2
5 files changed, 0 insertions, 12 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in
index bb49a8d..8c82ca9 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -215,7 +215,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@
@@ -230,7 +229,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/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 6c6e157..e9bbf47 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -182,7 +182,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@
@@ -197,7 +196,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/c++/src/Makefile.in b/c++/src/Makefile.in
index 2fd78d8..7a4d3ee 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -257,7 +257,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@
@@ -272,7 +271,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/c++/src/h5c++.in b/c++/src/h5c++.in
index e0ee8af..20435eb 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -100,10 +100,6 @@ CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}"
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/c++/test/Makefile.in b/c++/test/Makefile.in
index ea5d151..00a8056 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -218,7 +218,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@
@@ -233,7 +232,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@