diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-12-15 13:53:54 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-12-15 13:53:54 +0000 |
| commit | 952efe8aa5dc8e00a99f31683084cedc03717c86 (patch) | |
| tree | a989f2a49cef019a115d4597227599ef3c42ef6d | |
| parent | 7e76c54da0b8490b3239c55dd768a2bf80a41018 (diff) | |
| download | php-git-952efe8aa5dc8e00a99f31683084cedc03717c86.tar.gz | |
use $PHP_LIBDIR and don't cache libevent check results
| -rw-r--r-- | sapi/fpm/config.m4 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index bf82da4973..1d34b617dd 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -61,7 +61,13 @@ LD_LIBRARY_PATH_SAVED="$LD_LIBRARY_PATH" # 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 @@ if test "$PHP_FPM" != "no"; then 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, [ ], [ |