svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/fpm/config.m4 trunk/sapi/fpm/config.m4
| From: | Jérôme Loyet | Date: | Tue, 07 Sep 2010 21:12:28 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/fpm/config.m4 trunk/sapi/fpm/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63447@lists.php.net to get a copy of this message | ||
fat Tue, 07 Sep 2010 21:12:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303147
Log:
- Fixed bug #52498 (libevent was not only linked to php-fpm)
Bug: http://bugs.php.net/52498 (Assigned) when FPM is
enable, php-cli is linked against libevent (it shouldn't)
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/fpm/config.m4
U php/php-src/trunk/sapi/fpm/config.m4
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-09-07 21:01:03 UTC (rev 303146)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-09-07 21:12:28 UTC (rev 303147)
@@ -18,6 +18,7 @@
- Fixed possible crash in mssql_fetch_batch(). (Kalle)
- Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat)
+- Fixed bug #52498 (libevent was not only linked to php-fpm). (fat)
- Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they
were not available). (fat)
- Fixed bug #52745 (Binding params doesn't work when selecting a date inside a
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 2010-09-07 21:01:03 UTC (rev 303146)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 2010-09-07 21:12:28 UTC (rev 303147)
@@ -525,13 +525,20 @@
AC_LIB_EVENT([$minimum_libevent_version])
- PHP_ADD_LIBRARY_WITH_PATH(event, $LIBEVENT_PATH)
+ dnl check libevent build
+ LD_LIBRARY_PATH_SAVED="$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH="$LIBEVENT_PATH:$LD_LIBRARY_PATH"
- PHP_TEST_BUILD(event_init, [ ], [
+ AC_MSG_CHECKING(whether libevent build works)
+ PHP_TEST_BUILD(event_init, [
+ AC_MSG_RESULT(yes)
+ ], [
AC_MSG_RESULT(no)
- AC_MSG_ERROR([build test failed. Please check the config.log for details.])
+ AC_MSG_ERROR([build test failed. Please check the config.log for details])
], $LIBEVENT_LIBS)
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_SAVED"
+
AC_FPM_STDLIBS
AC_FPM_PRCTL
AC_FPM_CLOCK
Modified: php/php-src/trunk/sapi/fpm/config.m4
===================================================================
--- php/php-src/trunk/sapi/fpm/config.m4 2010-09-07 21:01:03 UTC (rev 303146)
+++ php/php-src/trunk/sapi/fpm/config.m4 2010-09-07 21:12:28 UTC (rev 303147)
@@ -525,13 +525,20 @@
AC_LIB_EVENT([$minimum_libevent_version])
- PHP_ADD_LIBRARY_WITH_PATH(event, $LIBEVENT_PATH)
+ dnl check libevent build
+ LD_LIBRARY_PATH_SAVED="$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH="$LIBEVENT_PATH:$LD_LIBRARY_PATH"
- PHP_TEST_BUILD(event_init, [ ], [
+ AC_MSG_CHECKING(whether libevent build works)
+ PHP_TEST_BUILD(event_init, [
+ AC_MSG_RESULT(yes)
+ ], [
AC_MSG_RESULT(no)
- AC_MSG_ERROR([build test failed. Please check the config.log for details.])
+ AC_MSG_ERROR([build test failed. Please check the config.log for details])
], $LIBEVENT_LIBS)
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_SAVED"
+
AC_FPM_STDLIBS
AC_FPM_PRCTL
AC_FPM_CLOCK