From: Jérôme Loyet <fat@php.net>
Date: Tue, 7 Sep 2010 21:12:28 +0000 (+0000)
Subject: - Fixed bug #52498 (libevent was not only linked to php-fpm)
X-Git-Tag: php-5.4.0alpha1~191^2~989
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75891691ed99f3a212e4c414e7c75047e60b946f;p=php

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

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 0fd5669626..4ad8db8e1e 100644
--- 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