aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786>2013-03-15 19:18:34 +0000
committereschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786>2013-03-15 19:18:34 +0000
commit68b112ceffcef0f714e2e13121c87f39a8cb65cb (patch)
tree280ab9be2ad223c05c8c01469864b818a2384459
parentf5840788ab7b6c16959158bb4e7b5bf57b7f983a (diff)
Disable shared libraries
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@70 fb53df36-e548-4a1e-8150-ab98cbd5e786
-rw-r--r--configure.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.sh b/configure.sh
index cb8f373..a2b2185 100644
--- a/configure.sh
+++ b/configure.sh
@@ -182,9 +182,7 @@ then
# Do not build Fortran API if it has been disabled, or if
# there is no Fortran 90 compiler.
# Do not build C++ API if it has been disabled.
- # Do not build shared library executables if we want to link
- # statically.
- ./configure --prefix=${HDF5_DIR} --with-zlib=${ZLIB_DIR} --enable-cxx=${HDF5_ENABLE_CXX} $(if [ -n "${FC}" ]; then echo '' "--enable-fortran=${HDF5_ENABLE_FORTRAN}"; fi) $(if echo '' "${LDFLAGS}" | grep -q '[-]static'; then echo '' '--disable-shared --enable-static-exec'; fi)
+ ./configure --prefix=${HDF5_DIR} --with-zlib=${ZLIB_DIR} --enable-cxx=${HDF5_ENABLE_CXX} $(if [ -n "${FC}" ]; then echo '' "--enable-fortran=${HDF5_ENABLE_FORTRAN}"; fi) --disable-shared --enable-static-exec
echo "HDF5: Building..."
${MAKE}
@@ -230,7 +228,6 @@ then
date > ${DONE_FILE}
echo "HDF5: Done."
-
)
if (( $? )); then