summaryrefslogtreecommitdiff
path: root/sapi/apache2filter
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2007-06-03 20:27:16 +0000
committerfoobar <sniper@php.net>2007-06-03 20:27:16 +0000
commit7bd41e0715c46bf63aae27a23d3fe3e7439a899a (patch)
tree733f9dbf1611de156c6b24a9bef15dff19e95fab /sapi/apache2filter
parentfd2e66bd05022b023379de86577e3498fded0e96 (diff)
downloadphp-git-7bd41e0715c46bf63aae27a23d3fe3e7439a899a.tar.gz
MFH:- Fixed bug #41576 (misbehaviour when using --without-apxs)
Diffstat (limited to 'sapi/apache2filter')
-rw-r--r--sapi/apache2filter/config.m415
1 files changed, 10 insertions, 5 deletions
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 47b397cf6d..8c8490250c 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -7,14 +7,20 @@ AC_ARG_WITH(apxs2filter,
[ --with-apxs2filter[=FILE]
EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional
pathname to the Apache apxs tool [apxs]],[
- if test "$withval" = "yes"; then
+ PHP_APXS2FILTER=$withval
+],[
+ PHP_APXS2FILTER=no
+])
+
+if test "$PHP_APXS2FILTER" != "no"; then
+ if test "$PHP_APXS2FILTER" = "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_APXS2FILTER, APXS)
fi
$APXS -q CFLAGS >/dev/null 2>&1
@@ -119,11 +125,10 @@ AC_ARG_WITH(apxs2filter,
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