[svn-r22819] Added H5BLD_STATIC and HDF5_USE_SHLIB to configure.ac so that if configured with --disable-static the default for HDF5_USE_SHLIB in the compile scripts will be changed to yes. This is a fix for HDFFV-8141, where the compile scripts try to link to non-existant static hdf5 libraries.

Tested on jam,koala,ostrich(h5committest) and other THG machines. 

1 files changed, 17 insertions, 0 deletions

diff --git a/configure b/configure
index e9996eb..42ad979 100755
--- a/configure
+++ b/configure
@@ -771,6 +771,8 @@ ac_ct_CC
 LDFLAGS
 CFLAGS
 CC
+HDF5_USE_SHLIB
+H5BLD_STATIC
 UNAME_INFO
 enable_static
 enable_shared
@@ -3997,6 +3999,13 @@ $as_echo "done" >&6; }
 
  UNAME_INFO=`uname -a`
 
+## Define symbol variables to allow h5cc.in and its companions to determine
+## whether static libraries are built or not.  When they are not built, the
+## compile scripts should use shared libraries by default
+
+ H5BLD_STATIC=yes
+
+
 ## ----------------------------------------------------------------------
 ## Some platforms have broken basename, and/or xargs programs. Check
 ## that it actually does what it's supposed to do. Catch this early
@@ -31084,6 +31093,14 @@ fi
 ## Build the Makefiles.
 ##
 
+## If $enable_static = "no", set HDF5_USE_SHLIB to "yes" so that the compile
+## scripts will default to use shared libraries instead of defaulting to
+## use static libraries.  Otherwise they fail because the static libraries
+## don't exist.
+if test "X$enable_static" = "Xno"; then
+  HDF5_USE_SHLIB="yes"
+fi
+
 ## The directory search list
  SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
 cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'