]> granicus.if.org Git - php/commitdiff
- #51821, fix --with-libevent-dir (patch by tony2001)
authorJérôme Loyet <fat@php.net>
Wed, 19 May 2010 11:29:31 +0000 (11:29 +0000)
committerJérôme Loyet <fat@php.net>
Wed, 19 May 2010 11:29:31 +0000 (11:29 +0000)
sapi/fpm/config.m4

index d3ffc67ddfde6e0ece287312f1bde4d56425cd3d..4c0b67fdae44901c8a32ba61a37dcdfe83af1cf1 100644 (file)
@@ -203,10 +203,12 @@ if test "$PHP_LIBEVENT_DIR" != "no"; then
   if test -n "$ac_libevent_path"; then
     LIBEVENT_CFLAGS="-I$ac_libevent_path/include"
     LIBEVENT_LIBS="-L$ac_libevent_path/$PHP_LIBDIR $LIBEVENT_LIBS"
+    LIBEVENT_PATH="$ac_libevent_path/$PHP_LIBDIR"
   fi
 
   AC_SUBST(LIBEVENT_CFLAGS)
   AC_SUBST(LIBEVENT_LIBS)
+  AC_SUBST(LIBEVENT_PATH)
 
 else
   AC_MSG_ERROR([FPM requires libevent >= $WANT_LIBEVENT_VERSION. Please specify libevent install prefix with --with-libevent-dir=yes])
@@ -505,6 +507,8 @@ if test "$PHP_FPM" != "no"; then
 
   AC_LIB_EVENT([$minimum_libevent_version])
 
+  PHP_ADD_LIBRARY_WITH_PATH(event, $LIBEVENT_PATH)
+
   PHP_TEST_BUILD(event_init, [ ], [
     AC_MSG_RESULT(no)
     AC_MSG_ERROR([build test failed. Please check the config.log for details.])