From f0bb265b2e4d8dfd9034950d4cbbb41e5233930d Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Mon, 5 Sep 2005 23:11:33 -0500
Subject: [svn-r11350] Purpose: Bug fix.

Description:
The incompatibility of enable-parallel and enable-cxx was not correctly
coded.  It would complained even for the case of
    ./configure --enable-cxx --disable-parallel.

Solution:
Changed it to use "$enable_XYZ" = "yes".  Fixed the same for the
enable-threadsafe checking too.

Platforms tested:
tested in heping.

Misc. update:
---
 configure    | 4 ++--
 configure.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 3456611..f73d5fe 100755
--- a/configure
+++ b/configure
@@ -48110,13 +48110,13 @@ if test "${enable_parallel+set}" = set; then
 
 fi;
 
-if test "X${HDF_CXX}" != "X" && test "X$enable_parallel" != "X"; then
+if test "${enable_cxx}" = "yes" -a "$enable_parallel" = "yes"; 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 "X${THREADSAFE}" != "X" && test "X$enable_parallel" != "X"; then
+if test "${enable_threadsafe}" = "yes" -a "$enable_parallel" = "yes"; 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; }; }
diff --git a/configure.in b/configure.in
index d2de3a9..28ace27 100644
--- a/configure.in
+++ b/configure.in
@@ -2033,12 +2033,12 @@ AC_ARG_ENABLE([parallel],
 
 dnl The --enable-parallel flag is not compatible with --enable-cxx.
 dnl If the user tried to specify both flags, throw an error.
-if test "X${HDF_CXX}" != "X" && test "X$enable_parallel" != "X"; then
+if test "${enable_cxx}" = "yes" -a "$enable_parallel" = "yes"; then
   AC_MSG_ERROR([--enable-cxx and --enable-parallel flags are incompatible])
 fi
 
 dnl --enable-parallel is also incompatible with --enable-threadsafe.
-if test "X${THREADSAFE}" != "X" && test "X$enable_parallel" != "X"; then
+if test "${enable_threadsafe}" = "yes" -a "$enable_parallel" = "yes"; then
   AC_MSG_ERROR([--enable-threadsafe and --enable-parallel flags are incompatible])
 fi
 
-- 
cgit v0.12