summaryrefslogtreecommitdiffstats
path: root/c++/src/Makefile.am
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2013-09-24 01:14:24 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2013-09-24 01:14:24 (GMT)
commitab239810e1ae81f390a91dfbb3e5d68934efee55 (patch)
treeace4b146b778237765c69c6fb0288c4f6ba4081c /c++/src/Makefile.am
parentc19d87b1fc55a3c89bbcea6d940e4b50a4961ef4 (diff)
downloadhdf5-ab239810e1ae81f390a91dfbb3e5d68934efee55.zip
hdf5-ab239810e1ae81f390a91dfbb3e5d68934efee55.tar.gz
hdf5-ab239810e1ae81f390a91dfbb3e5d68934efee55.tar.bz2
[svn-r24194] Don't add hdf5 library dependencies to lib files when --disable-sharedlib-rpath configure option is invoked. Fix for HDFFV-8276.
Tested with h5committest and on hdf-duck.
Diffstat (limited to 'c++/src/Makefile.am')
-rw-r--r--c++/src/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index ec942fd..759b4a7 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -47,8 +47,11 @@ libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp \
H5StrType.cpp H5ArrayType.cpp H5VarLenType.cpp H5CompType.cpp \
H5DataSet.cpp H5CommonFG.cpp H5Group.cpp H5File.cpp
-# HDF5 C++ library depends on HDF5 Library.
+# HDF5 C++ library depends on HDF5 Library. However, only add the dependency
+# if --enable-sharedlib-rpath is yes.
+if LT_ADD_LIBHDF5_DEPENDENCY
libhdf5_cpp_la_LIBADD=$(LIBHDF5)
+endif
# Public headers
include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \