[svn-r25117] Removed LT_ADD_LIBHDF5_DEPENDENCY configure conditional to roll back fix for removing rpaths from l
ib files. The fix also removed dependencies on libhdf5, etc. when the --disable-sharedlib-rpath co nfigure option was invoked. Added instead configure variable hardcode_into_lib=no. This removes rpath from lib files on Linux and solaris machines. Tested with h5committest on jam, koala, ostrich and platypus (cmake), and with configure option --disable-sharedlib-rpath on emu, platypus and quail.
This commit is contained in:
@@ -40,11 +40,8 @@ endif
|
||||
# At the moment, only the H5PT Packet Table has a C++ API.
|
||||
libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
|
||||
|
||||
# HDF5 HL C++ library depends on HDF5 Library. However, only add the dependency
|
||||
# if --enable-sharedlib-rpath is yes.
|
||||
if LT_ADD_LIBHDF5_DEPENDENCY
|
||||
# HDF5 HL C++ library depends on HDF5 Library.
|
||||
libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP)
|
||||
endif
|
||||
|
||||
# Public headers
|
||||
include_HEADERS=H5PacketTable.h
|
||||
|
||||
Reference in New Issue
Block a user