diff options
| author | Bruce Momjian | 2004-08-17 15:19:09 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-08-17 15:19:09 +0000 |
| commit | 5f91456d3e35fcdc76e2cfb261c1bfa82dd45a40 (patch) | |
| tree | e78f83bc599c2c5f5d2e4fd6fda6272bdd873dbe | |
| parent | bb8b712ff999d29e68b2b69e62f7f72687739452 (diff) | |
Fix agressive collection of thread flags.
| -rw-r--r-- | config/acx_pthread.m4 | 5 | ||||
| -rwxr-xr-x | 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 @@ -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 |