]>
Commit | Line | Data |
---|---|---|
c0240cb1 | 1 | diff -burN php-5.0.4RC1.orig/TSRM/threads.m4 php-5.0.4RC1/TSRM/threads.m4 |
2 | --- php-5.0.4RC1.orig/TSRM/threads.m4 2005-03-15 18:02:27.630294512 +0100 | |
3 | +++ php-5.0.4RC1/TSRM/threads.m4 2005-03-15 18:07:05.301082136 +0100 | |
4 | @@ -116,7 +116,6 @@ | |
5 | else | |
6 | save_CFLAGS=$CFLAGS | |
7 | save_LIBS=$LIBS | |
8 | - PTHREADS_ASSIGN_VARS | |
9 | PTHREADS_CHECK_COMPILE | |
10 | LIBS=$save_LIBS | |
11 | CFLAGS=$save_CFLAGS | |
12 | @@ -134,9 +133,10 @@ | |
13 | break | |
14 | fi | |
15 | done | |
16 | + pthreads_working= | |
17 | fi | |
18 | -fi | |
19 | ]) | |
20 | +fi | |
21 | ||
22 | AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[ | |
23 | ac_cv_pthreads_lib= | |
24 | @@ -163,6 +163,7 @@ | |
25 | dnl | |
26 | dnl | |
27 | AC_DEFUN([PTHREADS_ASSIGN_VARS],[ | |
28 | +if test "$pthreads_assign_done" != "yes" ; then | |
29 | if test -n "$ac_cv_pthreads_lib"; then | |
30 | LIBS="$LIBS -l$ac_cv_pthreads_lib" | |
31 | fi | |
32 | @@ -170,4 +171,6 @@ | |
33 | if test -n "$ac_cv_pthreads_cflags"; then | |
34 | CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" | |
35 | fi | |
36 | +pthreads_assign_done="yes" | |
37 | +fi | |
38 | ])dnl |