summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-03-22 07:59:28 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-03-22 07:59:28 (GMT)
commit7255d1a1b8e0b12cc652bf6d1becbe46bc328c6e (patch)
tree9959d6229ed788856bef9e7e4574e7a21c2db076
parent9c3568819f3e15d95a47e544fc13e00995e54f0e (diff)
downloadhdf5-7255d1a1b8e0b12cc652bf6d1becbe46bc328c6e.zip
hdf5-7255d1a1b8e0b12cc652bf6d1becbe46bc328c6e.tar.gz
hdf5-7255d1a1b8e0b12cc652bf6d1becbe46bc328c6e.tar.bz2
[svn-r29502] The thread-safety and enable Java options have been marked as
"unsupported" in the autotools. Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1 autotools serial w/ Java
-rw-r--r--configure.ac10
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 59157b2..272f5cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1575,7 +1575,7 @@ AC_ARG_ENABLE([threadsafe],
[default=no]])],
[THREADSAFE=$enableval])
-## The high-level, C++, and Fortran interfaces are not compatible
+## The high-level, C++, Fortran and Java interfaces are not compatible
## with the thread-safety option because the lock is not hoisted
## into the higher-level API calls.
@@ -1607,6 +1607,14 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
fi
fi
+## --enable-threadsafe is also incompatible with --enable-java unless
+## --enable-unsupported has been specified on the configure line.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+ if test "X${HDF_JAVA}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+ AC_MSG_ERROR([--enable-java and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error.])
+ fi
+fi
+
case "X-$THREADSAFE" in
X-|X-no)