- Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread)

diff --git a/NEWS b/NEWS
index fc33253506febf9a4ae45c6860635478c4ab1c8f..37f71c6ff0323038237fe240c77c7a7306e4793d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,14 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2005, PHP 5.1
-- Fixed bug #33312 (ReflectionParameter methods do not work correctly).
-  (Dmitry)
-
-11 Jun 2005, PHP 5.1 Beta 2
+?? Jun 2005, PHP 5.1 Beta 2
 - Fixed PDO shutdown problem (possible inifite loop running rollback on
   shutdown). (Wez)
 - Fixed PECL bug #3714 (beginTransaction doesn't work if you're in
   auto-commit mode). (Wez)
+- Fixed bug #33312 (ReflectionParameter methods do not work correctly).
+  (Dmitry)
+- Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread).
+  (Jani)
 
 10 Jun 2005, PHP 5.1 Beta 1
 - Upgraded PCRE library to version 5.0. (Andrei)

diff --git a/acinclude.m4 b/acinclude.m4
index 5bb5446f9faa317bbe407f4b0e6b97ea1bad42fd..e190806976f384019e76722953ede4f83df665b2 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -390,6 +390,13 @@ dnl
 AC_DEFUN([PHP_EVAL_LIBLINE],[
   for ac_i in $1; do
     case $ac_i in
+    -pthread[)]
+      if test "$ext_shared" = "yes"; then
+        $2="[$]$2 -pthread"
+      else
+        PHP_RUN_ONCE(EXTRA_LDFLAGS, [$ac_i], [EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"])
+      fi
+    ;;
     -l*[)]
       ac_ii=`echo $ac_i|cut -c 3-`
       PHP_ADD_LIBRARY($ac_ii,1,$2)