php-threads-acfix.patch

   1 --- php-4.3.1/TSRM/threads.m4.orig      Wed Feb 19 15:57:09 2003
   2 +++ php-4.3.1/TSRM/threads.m4   Wed Feb 19 15:57:42 2003
   3 @@ -108,7 +108,6 @@
   4  else
   5    save_CFLAGS=$CFLAGS
   6    save_LIBS=$LIBS
   7 -  PTHREADS_ASSIGN_VARS
   8    PTHREADS_CHECK_COMPILE
   9    LIBS=$save_LIBS
  10    CFLAGS=$save_CFLAGS
  11 @@ -126,9 +125,10 @@
  12          break
  13        fi
  14      done
  15 +    pthreads_working=
  16    fi
  17 -fi
  18  ])
  19 +fi
  20
  21  AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
  22  ac_cv_pthreads_lib=
  23 @@ -155,6 +155,7 @@
  24  dnl
  25  dnl
  26  AC_DEFUN([PTHREADS_ASSIGN_VARS],[
  27 +if test "$pthreads_assign_done" != "yes" ; then
  28  if test -n "$ac_cv_pthreads_lib"; then
  29    LIBS="$LIBS -l$ac_cv_pthreads_lib"
  30  fi
  31 @@ -162,4 +163,6 @@
  32  if test -n "$ac_cv_pthreads_cflags"; then
  33    CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
  34  fi
  35 +pthreads_assign_done="yes"
  36 +fi
  37  ])dnl
  38 --- php-4.3.4/TSRM/tsrm.m4.orig 2003-10-03 07:25:30.000000000 +0200
  39 +++ php-4.3.4/TSRM/tsrm.m4      2003-12-16 23:36:50.274455176 +0100
  40 @@ -68,7 +68,6 @@
  41  ])
  42
  43  sinclude(threads.m4)
  44 -sinclude(TSRM/threads.m4)
  45
  46  AC_DEFUN(TSRM_CHECK_PTHREADS,[
  47
  48 --- php-4.3.4/configure.in.orig 2003-12-16 23:38:01.000000000 +0100
  49 +++ php-4.3.4/configure.in      2003-12-16 23:41:38.479641328 +0100
  50 @@ -204,6 +204,7 @@
  51
  52  sinclude(Zend/acinclude.m4)
  53  sinclude(Zend/Zend.m4)
  54 +sinclude(TSRM/threads.m4)
  55  sinclude(TSRM/tsrm.m4)
  56
  57