cvs: php-src(PHP_4_3) /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

From: Date: Thu, 21 Oct 2004 19:41:56 +0000
Subject: cvs: php-src(PHP_4_3) /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-29002@lists.php.net to get a copy of this message
jorton Thu Oct 21 15:41:56 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handler config.m4 Log: MFH: Fixed apache2* SAPI build against httpd 2.1. http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.25.2.10&r2=1.25.2.11&ty=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.25.2.10 php-src/sapi/apache2filter/config.m4:1.25.2.11 --- php-src/sapi/apache2filter/config.m4:1.25.2.10 Fri Oct 3 01:25:44 2003 +++ php-src/sapi/apache2filter/config.m4 Thu Oct 21 15:41:54 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.10 2003/10/03 05:25:44 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.11 2004/10/21 19:41:54 jorton 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.1.2.7&r2=1.1.2.8&ty=u Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.1.2.7 php-src/sapi/apache2handler/config.m4:1.1.2.8 --- php-src/sapi/apache2handler/config.m4:1.1.2.7 Wed Jul 16 01:46:46 2003 +++ php-src/sapi/apache2handler/config.m4 Thu Oct 21 15:41:55 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.1.2.7 2003/07/16 05:46:46 sniper Exp $ +dnl $Id: config.m4,v 1.1.2.8 2004/10/21 19:41:55 jorton 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)

« previous php.cvs (#29002) next »