- Fixed bug #52498 (libevent was not only linked to php-fpm)

diff --git a/NEWS b/NEWS
index 61d7cfe3ab4a748d25888957662c622286abda5c..9461892ebe0e294e3846632c7b85d97e0c112ba6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 0fd566962600b5e9b434c791478286a665de72a9..4ad8db8e1e90ea59ee028de36008580136c57389 100644 (file)
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -525,13 +525,20 @@ if test "$PHP_FPM" != "no"; then
 
   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