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-r27692] Changed the autotools files so that the high-level library is unsupported

Browse Source 
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
This commit is contained in:
Dana Robinson 2015-09-07 18:44:41 -05:00
parent 34be1d1aed
commit 4c8902cdf0
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -1581,9 +1581,8 @@ Optional Features:
--disable-sharedlib-rpath --disable-sharedlib-rpath
Disable use of the '=Wl,-rpath' linker option Disable use of the '=Wl,-rpath' linker option
--enable-production Determines how to run the compiler. --enable-production Determines how to run the compiler.
--enable-threadsafe Enable thread-safe capability. This will disable the --enable-threadsafe Enable thread-safe capability. Not compatible with
high-level library. You can override this behavior the high-level library, Fortran, or C++ wrappers.
by specifying --enable-hl and --enable-unsupported.
[default=no] [default=no]
--enable-debug=all Turn on debugging in all packages. One may also --enable-debug=all Turn on debugging in all packages. One may also
specify a comma-separated list of package names specify a comma-separated list of package names
@ -25846,6 +25845,17 @@ fi
## with the thread-safety option because the lock is not hoisted ## with the thread-safety option because the lock is not hoisted
## into the higher-level API calls. ## into the higher-level API calls.
## --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. ## The --enable-threadsafe flag is not compatible with --enable-cxx.
## If the user tried to specify both flags, throw an error, unless ## If the user tried to specify both flags, throw an error, unless
## they also provided the --enable-unsupported flag. ## they also provided the --enable-unsupported flag.

14
configure.ac
View File

@ -1504,8 +1504,7 @@ AC_CACHE_SAVE
AC_MSG_CHECKING([for thread safe support]) AC_MSG_CHECKING([for thread safe support])
AC_ARG_ENABLE([threadsafe], AC_ARG_ENABLE([threadsafe],
[AS_HELP_STRING([--enable-threadsafe], [AS_HELP_STRING([--enable-threadsafe],
[Enable thread-safe capability. This will disable the high-level library. [Enable thread-safe capability. Not compatible with the high-level library, Fortran, or C++ wrappers.
You can override this behavior by specifying --enable-hl and --enable-unsupported.
[default=no]])], [default=no]])],
[THREADSAFE=$enableval]) [THREADSAFE=$enableval])
@ -1513,6 +1512,17 @@ AC_ARG_ENABLE([threadsafe],
## with the thread-safety option because the lock is not hoisted ## with the thread-safety option because the lock is not hoisted
## into the higher-level API calls. ## into the higher-level API calls.
## --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
AC_MSG_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.])
fi
fi
## The --enable-threadsafe flag is not compatible with --enable-cxx. ## The --enable-threadsafe flag is not compatible with --enable-cxx.
## If the user tried to specify both flags, throw an error, unless ## If the user tried to specify both flags, throw an error, unless
## they also provided the --enable-unsupported flag. ## they also provided the --enable-unsupported flag.