Commit 0d4aa039 authored by Bruce Momjian's avatar Bruce Momjian

Fix agressive collection of thread flags.

parent 26f6111d
...@@ -82,6 +82,8 @@ esac ...@@ -82,6 +82,8 @@ esac
if test x"$acx_pthread_ok" = xno; then if test x"$acx_pthread_ok" = xno; then
for flag in $acx_pthread_flags; do for flag in $acx_pthread_flags; do
tryPTHREAD_CFLAGS=""
tryPTHREAD_LIBS=""
case $flag in case $flag in
none) none)
AC_MSG_CHECKING([whether pthreads work without any flags]) AC_MSG_CHECKING([whether pthreads work without any flags])
...@@ -125,7 +127,7 @@ for flag in $acx_pthread_flags; do ...@@ -125,7 +127,7 @@ for flag in $acx_pthread_flags; do
[pthread_t th; pthread_join(th, 0); [pthread_t th; pthread_join(th, 0);
pthread_attr_init(0); pthread_cleanup_push(0, 0); pthread_attr_init(0); pthread_cleanup_push(0, 0);
pthread_create(0,0,0,0); pthread_cleanup_pop(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" LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
...@@ -138,7 +140,6 @@ for flag in $acx_pthread_flags; do ...@@ -138,7 +140,6 @@ for flag in $acx_pthread_flags; do
PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS" PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"
PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS" PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"
fi fi
done done
fi fi
......
...@@ -13204,6 +13204,8 @@ esac ...@@ -13204,6 +13204,8 @@ esac
if test x"$acx_pthread_ok" = xno; then if test x"$acx_pthread_ok" = xno; then
for flag in $acx_pthread_flags; do for flag in $acx_pthread_flags; do
tryPTHREAD_CFLAGS=""
tryPTHREAD_LIBS=""
case $flag in case $flag in
none) none)
echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 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 ...@@ -13317,6 +13319,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
acx_pthread_ok=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
...@@ -13332,7 +13335,6 @@ echo "${ECHO_T}$acx_pthread_ok" >&6 ...@@ -13332,7 +13335,6 @@ echo "${ECHO_T}$acx_pthread_ok" >&6
PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS" PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"
PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS" PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"
fi fi
done done
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment