summaryrefslogtreecommitdiff
path: root/sapi/apache2filter
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-07-16 05:46:36 +0000
committerfoobar <sniper@php.net>2003-07-16 05:46:36 +0000
commit5553b6827b95064e3d984c21ae51b1c41aeb60b4 (patch)
treeec15909ed516eda43176ee969ee2203082c57d5b /sapi/apache2filter
parent9887afad9ca84bab9f8c37d83f4b040693063132 (diff)
downloadphp-git-5553b6827b95064e3d984c21ae51b1c41aeb60b4.tar.gz
- Use the correct paths to apu-config / apr-config
Diffstat (limited to 'sapi/apache2filter')
-rw-r--r--sapi/apache2filter/config.m414
1 files changed, 8 insertions, 6 deletions
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 53e9e61eda..7cbe7ede72 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -36,9 +36,11 @@ AC_ARG_WITH(apxs2filter,
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APXS_CFLAGS=`$APXS -q CFLAGS`
APXS_MPM=`$APXS -q MPM_NAME`
+ APU_BINDIR=`$APXS -q APU_BINDIR`
+ APR_BINDIR=`$APXS -q APR_BINDIR`
- APU_INCLUDEDIR="`$APXS_BINDIR/apu-config --includes`"
- APR_INCLUDEDIR="`$APXS_BINDIR/apr-config --includes`"
+ APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
+ APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
for flag in $APXS_CFLAGS; do
case $flag in
@@ -81,11 +83,11 @@ AC_ARG_WITH(apxs2filter,
dnl the linker does not recursively look at the bundle loader and
dnl pull in its dependencies. Therefore, we must pull in the APR
dnl and APR-util libraries.
- if test -x "$APXS_BINDIR/apr-config"; then
- MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`"
+ if test -x "$APR_BINDIR/apr-config"; then
+ MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld --libs`"
fi
- if test -x "$APXS_BINDIR/apu-config"; then
- MH_BUNDLE_FLAGS="`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
+ if test -x "$APU_BINDIR/apu-config"; then
+ MH_BUNDLE_FLAGS="`$APU_BINDIR/apu-config --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
fi
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST(MH_BUNDLE_FLAGS)