From a30342e1d7012680c3fa48d3f889e033c0ada009 Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Thu, 12 May 2022 19:53:45 -0700
Subject: Allows parallel + thread-safe combination in Autotools and CMake
 (#1760)

---
 CMakeLists.txt | 9 ---------
 configure.ac   | 8 --------
 2 files changed, 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cad378b..018c46d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -830,15 +830,6 @@ if (HDF5_ENABLE_THREADSAFE)
       message (VERBOSE " **** thread-safety option will not be used building static library **** ")
     endif ()
   endif ()
-  if (HDF5_ENABLE_PARALLEL)
-    if (NOT ALLOW_UNSUPPORTED)
-      message (FATAL_ERROR " **** parallel and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
-    else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE " **** Allowing unsupported parallel and thread-safety options **** ")
-      endif ()
-    endif ()
-  endif ()
   if (HDF5_BUILD_FORTRAN)
     if (NOT ALLOW_UNSUPPORTED)
       message (FATAL_ERROR " **** Fortran and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
diff --git a/configure.ac b/configure.ac
index 908ece7..d2d6441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2755,14 +2755,6 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   fi
 fi
 
-## --enable-parallel is also incompatible with --enable-threadsafe, unless
-## --enable-unsupported has been specified on the configure line.
-if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
-  if test "X${THREADSAFE}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
-    AC_MSG_ERROR([--enable-threadsafe and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error.])
-  fi
-fi
-
 AC_MSG_CHECKING([for parallel support files])
 case "X-$enable_parallel" in
   X-|X-no|X-none)
-- 
cgit v0.12