diff options
| author | Derick Rethans <derick@php.net> | 2004-08-23 09:01:27 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2004-08-23 09:01:27 +0000 |
| commit | 6ffc1c291aedba07cc4e4e463172e0ba854e8f71 (patch) | |
| tree | be312b78c96f9dddf89d0d4ad68b4dfaa869ac07 | |
| parent | 05bf7d9c653a5edaed3c7553f1717f665e440db9 (diff) | |
| download | php-git-6ffc1c291aedba07cc4e4e463172e0ba854e8f71.tar.gz | |
- MFB: Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Patch by Joe Orton)
| -rw-r--r-- | sapi/apache2filter/config.m4 | 12 | ||||
| -rw-r--r-- | sapi/apache2handler/config.m4 | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index 4ce866b17d..decdd803cf 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -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) diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 5b29914976..b370aa99ab 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -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) |