From 0d4aa039acb80df2018e4b8653dfedea89feefd2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 17 Aug 2004 15:19:09 +0000
Subject: [PATCH] Fix agressive collection of thread flags.

---
 config/acx_pthread.m4 | 5 +++--
 configure             | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/acx_pthread.m4 b/config/acx_pthread.m4
index ba3f46395c..2228a6e008 100644
--- a/config/acx_pthread.m4
+++ b/config/acx_pthread.m4
@@ -82,6 +82,8 @@ esac
 if test x"$acx_pthread_ok" = xno; then
 for flag in $acx_pthread_flags; do
 
+        tryPTHREAD_CFLAGS=""
+        tryPTHREAD_LIBS=""
         case $flag in
                 none)
                 AC_MSG_CHECKING([whether pthreads work without any flags])
@@ -125,7 +127,7 @@ for flag in $acx_pthread_flags; do
                     [pthread_t th; pthread_join(th, 0);
                      pthread_attr_init(0); pthread_cleanup_push(0, 0);
                      pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-                    [acx_pthread_ok=yes])
+                    [acx_pthread_ok=yes], [acx_pthread_ok=no])
 
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
@@ -138,7 +140,6 @@ for flag in $acx_pthread_flags; do
             PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"
             PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"
         fi
-
 done
 fi
 
diff --git a/configure b/configure
index 27d9894310..d3f7c7775a 100755
--- a/configure
+++ b/configure
@@ -13204,6 +13204,8 @@ esac
 if test x"$acx_pthread_ok" = xno; then
 for flag in $acx_pthread_flags; do
 
+        tryPTHREAD_CFLAGS=""
+        tryPTHREAD_LIBS=""
         case $flag in
                 none)
                 echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
@@ -13317,6 +13319,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+acx_pthread_ok=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
@@ -13332,7 +13335,6 @@ echo "${ECHO_T}$acx_pthread_ok" >&6
             PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"
             PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"
         fi
-
 done
 fi