diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2012-09-27 04:49:19 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2012-09-27 04:49:19 (GMT) |
commit | c5371d76189dee408b9f15a46fbfbf102d009636 (patch) | |
tree | 551cf87d4fde2e1b9d821f266d8159ece36bfd4a /c++/src | |
parent | 7702c7f760f0a4eb01059b621cf0df747153a021 (diff) | |
download | hdf5-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')
-rw-r--r-- | c++/src/Makefile.in | 2 | ||||
-rw-r--r-- | c++/src/h5c++.in | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 4265900..3dd5c58 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -257,6 +257,7 @@ 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@ @@ -271,6 +272,7 @@ 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 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() { |