From 6ffc1c291aedba07cc4e4e463172e0ba854e8f71 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Mon, 23 Aug 2004 09:01:27 +0000 Subject: - MFB: Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Patch by Joe Orton) --- sapi/apache2handler/config.m4 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'sapi/apache2handler') 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) -- cgit v1.2.1