summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>2000-06-23 17:44:30 (GMT)
committerRobb Matzke <matzke@llnl.gov>2000-06-23 17:44:30 (GMT)
commit2c56fcbe237d71cc7da4ff89ddd087c0d46c34a5 (patch)
tree0e679303eda660e6820c496997a32aa6990838cf
parente852a8b54e9cfccc3f71241cabd6bab913a542e5 (diff)
downloadhdf5-2c56fcbe237d71cc7da4ff89ddd087c0d46c34a5.zip
hdf5-2c56fcbe237d71cc7da4ff89ddd087c0d46c34a5.tar.gz
hdf5-2c56fcbe237d71cc7da4ff89ddd087c0d46c34a5.tar.bz2
[svn-r2409] If the user wants static/shared libs but ltconfig decides it can't build
static/shared libs then the comment in libhdf5.settings will be correct.
-rw-r--r--configure.in23
1 files changed, 19 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index 772e275..ba0e10d 100644
--- a/configure.in
+++ b/configure.in
@@ -1213,13 +1213,28 @@ else
BYTESEX="little-endian"
fi
-# Are we compiling static libraries, shared libraries, or both?
+# Are we compiling static libraries, shared libraries, or both? This is only
+# used for the libhdf5.settings file. We can't just look at $enable_static and
+# $enable_shared because if they're yes the ltconfig might have decided that
+# one or the other is simply not possible. Therefore we have to look in the
+# generated `libtool' shell script for lines that set the value of
+# `build_libtool_libs' (shared) and `build_old_libs' (static).
AC_SUBST(STATIC_SHARED)
-if test "X-$enable_static" = "X-yes" && test "X-$enable_shared" = "X-yes"; then
+if (grep '^build_libtool_libs=yes' libtool >/dev/null); then
+ enable_shared=yes
+else
+ enable_shared=no
+fi
+if (grep '^build_old_libs=yes' libtool >/dev/null); then
+ enable_static=yes
+else
+ enable_static=no
+fi
+if test $enable_static = yes && test $enable_shared = yes; then
STATIC_SHARED="static, shared"
-elif test "X-$enable_static" = "X-yes"; then
+elif test $enable_static = yes; then
STATIC_SHARED="static"
-elif test "X-$enable_shared" = "X-yes"; then
+elif test $enable_shared = yes; then
STATIC_SHARED="shared"
else
STATIC_SHARED="none"