[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:
This commit is contained in:
James Laird 2005-09-06 11:57:05 -05:00
parent f0bb265b2e
commit 9b1828ffd0
2 changed files with 25 additions and 4 deletions

15
configure vendored
View File

@ -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

View File

@ -2033,15 +2033,25 @@ 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 "${enable_cxx}" = "yes" -a "$enable_parallel" = "yes"; then
if test "X${HDF_CXX}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
AC_MSG_ERROR([--enable-cxx and --enable-parallel flags are incompatible])
fi
dnl --enable-parallel is also incompatible with --enable-threadsafe.
if test "${enable_threadsafe}" = "yes" -a "$enable_parallel" = "yes"; then
if test "X${THREADSAFE}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
AC_MSG_ERROR([--enable-threadsafe and --enable-parallel flags are incompatible])
fi
dnl It's possible to build in parallel by specifying a parallel compiler
dnl without using the --enable-parallel flag. This isn't allowed with
dnl C++ or threadsafe, either.
if test "X${PARALLEL}" != "X" -a "X${enable_cxx}" = "Xyes" ; then
AC_MSG_ERROR([An MPI compiler is being used; --enable-cxx is not allowed])
fi
if test "X${PARALLEL}" != "X" -a "X${THREADSAFE}" = "Xyes"; then
AC_MSG_ERROR([An MPI compiler is being used; --enable-threadsafe is not allowed])
fi
AC_MSG_CHECKING([for parallel support files])
case "X-$enable_parallel" in
X-|X-no|X-none)