mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22774] The matching configure file

Browse Source 
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
This commit is contained in:
Allen Byrne 2012-09-17 11:18:05 -05:00
parent 06eb364890
commit 315ab68bd1
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -8336,9 +8336,6 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
## ---------------------------------------------------------------------- ## ----------------------------------------------------------------------
## Create libtool. If shared/static libraries are going to be enabled ## Create libtool. If shared/static libraries are going to be enabled
## or disabled, it should happen before these macros. ## or disabled, it should happen before these macros.
enable_dlopen=yes
case `pwd` in case `pwd` in
*\ * | *\ *) *\ * | *\ *)
@ -11883,6 +11880,7 @@ func_stripname_cnf ()
# Set options # Set options
enable_dlopen=yes
@ -26369,6 +26367,23 @@ if test "${enable_threadsafe+set}" = set; then :
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.
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 case "X-$THREADSAFE" in
X-|X-no) X-|X-no)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5