tony2001 Tue, 15 Dec 2009 13:53:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292169
Log:
use $PHP_LIBDIR and don't cache libevent check results
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4 2009-12-15 13:50:24 UTC
(rev 292168)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4 2009-12-15 13:53:54 UTC
(rev 292169)
@@ -61,7 +61,13 @@
# Set our flags if we are checking a specific directory.
if test -n "$ac_libevent_path" ; then
LIBEVENT_CPPFLAGS="-I$ac_libevent_path/include"
- LIBEVENT_LDFLAGS="-L$ac_libevent_path/lib"
+
+ if test -z "$PHP_LIBDIR"; then
+ LIBEVENT_LDFLAGS="-L$ac_libevent_path/lib"
+ else
+ LIBEVENT_LDFLAGS="-L$ac_libevent_path/$PHP_LIBDIR"
+ fi
+
LD_LIBRARY_PATH="$ac_libevent_path/lib:$LD_LIBRARY_PATH"
else
LIBEVENT_CPPFLAGS=""
@@ -504,15 +510,10 @@
AC_LIB_EVENT([$minimum_libevent_version])
- AC_CACHE_CHECK(whether libevent build works, php_cv_libevent_build_works, [
- PHP_TEST_BUILD(event_init,
- [
- php_cv_libevent_build_works=yes
- ], [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([build test failed. Please check the config.log for
details.])
- ], $LIBEVENT_LIBS)
- ])
+ PHP_TEST_BUILD(event_init, [ ], [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([build test failed. Please check the config.log for details.])
+ ], $LIBEVENT_LIBS)
PHP_SETUP_LIBXML(FPM_SHARED_LIBADD, [
], [
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
