[svn-r11353] Purpose:

Bug fix

Description:
Configure should now throw an error when C++ or threadsafe is enabled
and a parallel compiler is being used.


Platforms tested:
sleipnir and modi4
Tested
--enable-cxx --enable-parallel --disable-cxx
--enable-cxx --disable-parallel
cases in particular.

Misc. update:

1 files changed, 13 insertions, 2 deletions

diff --git a/configure b/configure
index f73d5fe..dfe6737 100755
--- a/configure
+++ b/configure
@@ -48110,18 +48110,29 @@ if test "${enable_parallel+set}" = set; then
 
 fi;
 
-if test "${enable_cxx}" = "yes" -a "$enable_parallel" = "yes"; then
+if test "X${HDF_CXX}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
   { { echo "$as_me:$LINENO: error: --enable-cxx and --enable-parallel flags are incompatible" >&5
 echo "$as_me: error: --enable-cxx and --enable-parallel flags are incompatible" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if test "${enable_threadsafe}" = "yes" -a "$enable_parallel" = "yes"; then
+if test "X${THREADSAFE}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
   { { echo "$as_me:$LINENO: error: --enable-threadsafe and --enable-parallel flags are incompatible" >&5
 echo "$as_me: error: --enable-threadsafe and --enable-parallel flags are incompatible" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+if test "X${PARALLEL}" != "X" -a "X${enable_cxx}" = "Xyes" ; then
+  { { echo "$as_me:$LINENO: error: An MPI compiler is being used; --enable-cxx is not allowed" >&5
+echo "$as_me: error: An MPI compiler is being used; --enable-cxx is not allowed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test "X${PARALLEL}" != "X" -a "X${THREADSAFE}" = "Xyes"; then
+  { { echo "$as_me:$LINENO: error: An MPI compiler is being used; --enable-threadsafe is not allowed" >&5
+echo "$as_me: error: An MPI compiler is being used; --enable-threadsafe is not allowed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 echo "$as_me:$LINENO: checking for parallel support files" >&5
 echo $ECHO_N "checking for parallel support files... $ECHO_C" >&6
 case "X-$enable_parallel" in