fat                                      Wed, 19 May 2010 11:29:31 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299485

Log:
- #51821, fix --with-libevent-dir (patch by tony2001)

Bug: http://bugs.php.net/51821 (Assigned) configure fails to pick up a custom 
prefix for libevent
      
Changed paths:
    U   php/php-src/trunk/sapi/fpm/config.m4

Modified: php/php-src/trunk/sapi/fpm/config.m4
===================================================================
--- php/php-src/trunk/sapi/fpm/config.m4        2010-05-19 11:28:08 UTC (rev 
299484)
+++ php/php-src/trunk/sapi/fpm/config.m4        2010-05-19 11:29:31 UTC (rev 
299485)
@@ -203,10 +203,12 @@
   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 @@

   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.])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to