sniper Wed Jul 16 01:46:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/apache2filter config.m4
/php-src/sapi/apache2handler config.m4
Log:
MFH
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.25.2.8
php-src/sapi/apache2filter/config.m4:1.25.2.9
--- php-src/sapi/apache2filter/config.m4:1.25.2.8 Tue Jul 8 10:13:10 2003
+++ php-src/sapi/apache2filter/config.m4 Wed Jul 16 01:46:46 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.8 2003/07/08 14:13:10 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.9 2003/07/16 05:46:46 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -36,9 +36,11 @@
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 @@
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)
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.1.2.6
php-src/sapi/apache2handler/config.m4:1.1.2.7
--- php-src/sapi/apache2handler/config.m4:1.1.2.6 Tue Jul 8 09:54:14 2003
+++ php-src/sapi/apache2handler/config.m4 Wed Jul 16 01:46:46 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.1.2.6 2003/07/08 13:54:14 sniper Exp $
+dnl $Id: config.m4,v 1.1.2.7 2003/07/16 05:46:46 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -36,9 +36,11 @@
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 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
