summaryrefslogtreecommitdiffstats
path: root/c++/src/h5c++.in
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2012-09-27 04:49:19 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2012-09-27 04:49:19 (GMT)
commitc5371d76189dee408b9f15a46fbfbf102d009636 (patch)
tree551cf87d4fde2e1b9d821f266d8159ece36bfd4a /c++/src/h5c++.in
parent7702c7f760f0a4eb01059b621cf0df747153a021 (diff)
downloadhdf5-c5371d76189dee408b9f15a46fbfbf102d009636.zip
hdf5-c5371d76189dee408b9f15a46fbfbf102d009636.tar.gz
hdf5-c5371d76189dee408b9f15a46fbfbf102d009636.tar.bz2
[svn-r22819] Added H5BLD_STATIC and HDF5_USE_SHLIB to configure.ac so that if configured with --disable-static the default for HDF5_USE_SHLIB in the compile scripts will be changed to yes. This is a fix for HDFFV-8141, where the compile scripts try to link to non-existant static hdf5 libraries.
Tested on jam,koala,ostrich(h5committest) and other THG machines.
Diffstat (limited to 'c++/src/h5c++.in')
-rw-r--r--c++/src/h5c++.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index 20435eb..e0ee8af 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -100,6 +100,10 @@ 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() {