clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- MFB: Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Patch by Joe Orton)

Browse Source
This commit is contained in:
Derick Rethans 2004-08-23 09:01:27 +00:00
parent 05bf7d9c65
commit 6ffc1c291a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sapi/apache2filter/config.m4
View File

@ -40,8 +40,14 @@ AC_ARG_WITH(apxs2filter,
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 @@ AC_ARG_WITH(apxs2filter,
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)

12
sapi/apache2handler/config.m4
View File

@ -39,8 +39,14 @@ AC_ARG_WITH(apxs2,
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 @@ AC_ARG_WITH(apxs2,
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)