summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-03-11 03:49:12 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-03-11 03:49:12 (GMT)
commitbdb7ec34976ea549e13feced52942ec9c8908616 (patch)
tree248e0267c728810d01a58a78f8c27417623f0a64 /c++
parent50f6da2062c78a0b3fd47d959b106a1d24602caa (diff)
downloadhdf5-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 'c++')
-rw-r--r--c++/src/Makefile.am6
-rw-r--r--c++/test/Makefile.am6
2 files changed, 0 insertions, 12 deletions
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index 7c1f497..cdef7bf 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -30,12 +30,6 @@ lib_LTLIBRARIES=libhdf5_cpp.la
# Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
libhdf5_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
-
bin_SCRIPTS=h5c++
# Source files for the library
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am
index 2717e9c..705ec72 100644
--- a/c++/test/Makefile.am
+++ b/c++/test/Makefile.am
@@ -23,12 +23,6 @@ include $(top_srcdir)/config/commence.am
# Include src, test, and c++/src directories
AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
-# 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=testhdf5