derick Mon Aug 23 05:01:27 2004 EDT
Modified files:
/php-src/sapi/apache2filter config.m4
/php-src/sapi/apache2handler config.m4
Log:
- MFB: Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Patch by Joe Orton)
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.36&r2=1.37&ty=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.36
php-src/sapi/apache2filter/config.m4:1.37
--- php-src/sapi/apache2filter/config.m4:1.36 Fri Oct 3 01:24:27 2003
+++ php-src/sapi/apache2filter/config.m4 Mon Aug 23 05:01:27 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.36 2003/10/03 05:24:27 sniper Exp $
+dnl $Id: config.m4,v 1.37 2004/08/23 09:01:27 derick Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -40,8 +40,14 @@
APU_BINDIR=`$APXS -q APU_BINDIR`
APR_BINDIR=`$APXS -q APR_BINDIR`
- APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
- APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
+ # Pick up ap[ru]-N-config if using httpd >=2.1
+ APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+ echo $APR_BINDIR/apr-config`
+ APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+ echo $APU_BINDIR/apu-config`
+
+ APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+ APU_CFLAGS="`$APU_CONFIG --includes`"
for flag in $APXS_CFLAGS; do
case $flag in
@@ -49,7 +55,7 @@
esac
done
- APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
+ APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.9
php-src/sapi/apache2handler/config.m4:1.10
--- php-src/sapi/apache2handler/config.m4:1.9 Tue Oct 21 07:48:31 2003
+++ php-src/sapi/apache2handler/config.m4 Mon Aug 23 05:01:27 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.9 2003/10/21 11:48:31 sniper Exp $
+dnl $Id: config.m4,v 1.10 2004/08/23 09:01:27 derick Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -39,8 +39,14 @@
APU_BINDIR=`$APXS -q APU_BINDIR`
APR_BINDIR=`$APXS -q APR_BINDIR`
- APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
- APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
+ # Pick up ap[ru]-N-config if using httpd >=2.1
+ APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+ echo $APR_BINDIR/apr-config`
+ APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+ echo $APU_BINDIR/apu-config`
+
+ APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+ APU_CFLAGS="`$APU_CONFIG --includes`"
for flag in $APXS_CFLAGS; do
case $flag in
@@ -48,7 +54,7 @@
esac
done
- APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
+ APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
