diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-03-11 03:49:12 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-03-11 03:49:12 (GMT) |
| commit | bdb7ec34976ea549e13feced52942ec9c8908616 (patch) | |
| tree | 248e0267c728810d01a58a78f8c27417623f0a64 /hl/c++ | |
| parent | 50f6da2062c78a0b3fd47d959b106a1d24602caa (diff) | |
| download | hdf5-bdb7ec34976ea549e13feced52942ec9c8908616.zip hdf5-bdb7ec34976ea549e13feced52942ec9c8908616.tar.gz hdf5-bdb7ec34976ea549e13feced52942ec9c8908616.tar.bz2 | |
[svn-r26422] Fixes autogen.sh errors caused by r26410 that produced:
CXX_SHARED_CONDITIONAL does not appear in AM_CONDITIONAL
This was due to a removed AM_CONDITIONAL macro in configure.ac.
The CXX_SHARED_CONDITIONAL code was removed from the Makefile.am
files. Additionally, the C++ shared library build settings field in
libhdf5.settings file was updated.
Tested on: local linux VM w/ C++
--enable-shared --enable-static
--enable-shared --disable-static
--disable-shared --enable-static
Diffstat (limited to 'hl/c++')
| -rw-r--r-- | hl/c++/src/Makefile.am | 6 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.am | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index 9751e94..b268948 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -30,12 +30,6 @@ lib_LTLIBRARIES=libhdf5_hl_cpp.la # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am) libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -# Shared C++ libraries aren't universally supported. -if CXX_SHARED_CONDITIONAL -else - AM_LDFLAGS+=-static -endif - # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am index 105188f..c835843 100644 --- a/hl/c++/test/Makefile.am +++ b/hl/c++/test/Makefile.am @@ -23,12 +23,6 @@ include $(top_srcdir)/config/commence.am # Include directories AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/c++/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test -I$(top_builddir)/hl/test -I$(top_srcdir)/hl/test -# Shared C++ libraries aren't universally supported. -if CXX_SHARED_CONDITIONAL -else - AM_LDFLAGS+=-static -endif - # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. TEST_PROG=ptableTest |