More cleanup of thread tests.

1 files changed, 31 insertions, 24 deletions

diff --git a/configure.in b/configure.in
index fd7fc371a52..34ad092e918 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.334 2004/04/26 04:04:42 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.335 2004/04/26 13:14:48 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1215,39 +1215,46 @@ echo >src/include/stamp-h
 
 AC_OUTPUT
 
-#
+# Check for gmake.
+AC_CHECK_PROGS(MAKE, gmake make)
+if ! $MAKE -v | grep 'GNU Make' >/dev/null
+then	rm -f $srcdir/src/Makefile.global
+	AC_MSG_CHECKING([Can not find GNU Make.  It is required.])
+fi
+
+# Thread testing
+
 # We have to run the thread test here because it is an external program
 # that has to be runable separately for cross-compiling.
 #
 if test "$enable_thread_safety" = yes; then
 if test cross_compiling != yes; then
-AC_CHECK_PROGS(MAKE, gmake make)
-AC_MSG_CHECKING([thread safety of required library functions.])
 #
 # Clean, compile, run, and clean thread test directory.
 # If test fails for any reason, remove Makefile.global so the user can't
 # compile (to simulate a configure failure).
 #
-$MAKE -C $srcdir/src/tools/thread clean >&5 ||
-	( rm -f src/Makefile.global
-	  AC_MSG_ERROR([Can not clean thread test directory.])) ||
-	exit $?
-$MAKE -C $srcdir/src/tools/thread >&5 ||
-	( rm -f src/Makefile.global
-	  AC_MSG_ERROR([Can not build thread test proram.])) ||
-	exit $?
-$srcdir/src/tools/thread/thread_test >&5 ||
-	( rm -f src/Makefile.global
-	  echo "no"
-	  echo
-	  $srcdir/src/tools/thread/thread_test
-	  echo
-	  AC_MSG_ERROR([Thread test program failed.  Your platform is not thread-safe.])) ||
-	exit $?
-$MAKE -C $srcdir/src/tools/thread clean >&5 ||
-	( rm -f src/Makefile.global
-	  AC_MSG_ERROR([Can not clean thread test directory.])) ||
-	exit $?
+AC_MSG_CHECKING([thread safety of required library functions])
+if ! $MAKE -C $srcdir/src/tools/thread clean >&5
+then	rm -f $srcdir/src/Makefile.global
+	AC_MSG_ERROR([Can not clean thread test directory.])
+fi
+if ! $MAKE -C $srcdir/src/tools/thread >&5
+then	rm -f $srcdir/src/Makefile.global
+	AC_MSG_ERROR([Can not build thread test proram.])
+fi
+if ! $srcdir/src/tools/thread/thread_test >&5
+then	rm -f $srcdir/src/Makefile.global
+	echo "no"
+	echo
+	$srcdir/src/tools/thread/thread_test
+	echo
+	AC_MSG_ERROR([Thread test program failed.  Your platform is not thread-safe.])
+fi
+if ! $MAKE -C $srcdir/src/tools/thread clean >&5
+then	rm -f $srcdir/src/Makefile.global
+	AC_MSG_ERROR([Can not clean thread test directory.])
+fi
 echo "yes"
 else
 AC_MSG_WARN([