diff options
| author | foobar <sniper@php.net> | 2007-06-03 20:27:16 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2007-06-03 20:27:16 +0000 |
| commit | 7bd41e0715c46bf63aae27a23d3fe3e7439a899a (patch) | |
| tree | 733f9dbf1611de156c6b24a9bef15dff19e95fab /sapi/apache2handler | |
| parent | fd2e66bd05022b023379de86577e3498fded0e96 (diff) | |
| download | php-git-7bd41e0715c46bf63aae27a23d3fe3e7439a899a.tar.gz | |
MFH:- Fixed bug #41576 (misbehaviour when using --without-apxs)
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/config.m4 | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 05659e5c1e..69db4e78e9 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -6,14 +6,20 @@ AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS) AC_ARG_WITH(apxs2, [ --with-apxs2[=FILE] Build shared Apache 2.0 Handler module. FILE is the optional pathname to the Apache apxs tool [apxs]],[ - if test "$withval" = "yes"; then + PHP_APXS2=$withval +], [ + PHP_APXS2=no +]) + +if test "$PHP_APXS2" != "no"; then + if test "$PHP_APXS2" = "yes"; then APXS=apxs $APXS -q CFLAGS >/dev/null 2>&1 if test "$?" != "0" && test -x /usr/sbin/apxs; then APXS=/usr/sbin/apxs fi else - PHP_EXPAND_PATH($withval, APXS) + PHP_EXPAND_PATH($PHP_APXS2, APXS) fi $APXS -q CFLAGS >/dev/null 2>&1 @@ -118,11 +124,10 @@ AC_ARG_WITH(apxs2, PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) - PHP_SUBST(APXS) -],[ +else AC_MSG_RESULT(no) -]) +fi dnl ## Local Variables: dnl ## tab-width: 4 |