[svn-r27756] Merge of r27692 from trunk

Changed the autotools files so that the high-level library is unsupported
when building the thread-safe library.

Configure will quit with an error when --disable-hl or
--enable-unsupported is not used with --enable-threadsafe.

Fixes HDFFV-8719

Tested on: h5committest
           configure w/ various combinations of --enable-threadsafe,
           --disable-hl, and --enable-unsupported

1 files changed, 15 insertions, 2 deletions

diff --git a/configure b/configure
index e8851f3..04d832b 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 27742 2015-09-10 10:59:56Z derobins .
+# From configure.ac Id: configure.ac 27743 2015-09-10 11:11:32Z derobins .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for HDF5 1.8.16-snap16.
 #
@@ -1575,7 +1575,9 @@ Optional Features:
   --disable-sharedlib-rpath
                           Disable use of the '=Wl,-rpath' linker option
   --enable-production     Determines how to run the compiler.
-  --enable-threadsafe     Enable thread-safe capability
+  --enable-threadsafe     Enable thread-safe capability. Not compatible with
+                          the high-level library, Fortran, or C++ wrappers.
+                          [default=no]
   --enable-debug=all      Turn on debugging in all packages. One may also
                           specify a comma-separated list of package names
                           without the leading H5 or the word no. The default
@@ -25092,6 +25094,17 @@ if test "${enable_threadsafe+set}" = set; then :
 fi
 
 
+## --enable-threadsafe is incompatible with --enable-hl unless
+## --enable-unsupported has been specified on the configure line.
+##
+## Note that the high-level library is enabled by default so most
+## users will have to add --disable-hl to the configure options.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF5_HL}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+    as_fn_error $? "The thread-safe library is incompatible with the high-level library. --disable-hl can be used to prevent building the high-level library (recommended). Alternatively, --enable-unsupported will allow building the high-level library, though this configuration is not supported by The HDF Group." "$LINENO" 5
+  fi
+fi
+
 ## The --enable-threadsafe flag is not compatible with --enable-cxx.
 ## If the user tried to specify both flags, throw an error, unless
 ## they also provided the --enable-unsupported flag.