From 315ab68bd117a2c7f89b220a37adcf35b93d7c03 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 17 Sep 2012 11:18:05 -0500
Subject: [svn-r22774] The matching configure file Use   LT_PREREQ([2.2])  
 LT_INIT([dlopen]) instead of   AC_LIBTOOL_DLOPEN   AM_PROG_LIBTOOL

Also add ALLOW_UNSUPPORTED on threadsafe check

Both from 1.8 configure
---
 configure | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 84637a3..7c043fb 100755
--- a/configure
+++ b/configure
@@ -8336,9 +8336,6 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 ## ----------------------------------------------------------------------
 ## Create libtool.  If shared/static libraries are going to be enabled
 ## or disabled, it should happen before these macros.
-enable_dlopen=yes
-
-
 
 case `pwd` in
   *\ * | *\	*)
@@ -11883,6 +11880,7 @@ func_stripname_cnf ()
 
 
 # Set options
+enable_dlopen=yes
 
 
 
@@ -26369,6 +26367,23 @@ if test "${enable_threadsafe+set}" = set; then :
 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.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+    as_fn_error $? "--enable-cxx and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
+  fi
+fi
+
+## --enable-threadsafe is also incompatible with --enable-fortran, unless
+## --enable-unsupported has been specified on the configure line.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+    as_fn_error $? "--enable-fortran and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
+  fi
+fi
+
 case "X-$THREADSAFE" in
   X-|X-no)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-- 
cgit v0.12