cvs: php4(PHP_4_2_0) /sapi/apache config.m4 /sapi/apache2filter config.m4

sniper Thu Apr 25 23:13:01 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: MFH: fix bug: #16791 (more reliable version check) Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.47.2.2 php4/sapi/apache/config.m4:1.47.2.3 --- php4/sapi/apache/config.m4:1.47.2.2 Sun Apr 14 11:00:40 2002 +++ php4/sapi/apache/config.m4 Thu Apr 25 23:12:59 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47.2.2 2002/04/14 15:00:40 sniper Exp $ +dnl $Id: config.m4,v 1.47.2.3 2002/04/26 03:12:59 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -33,17 +33,20 @@ APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" APXS_INCLUDEDIR=$APXS -q INCLUDEDIR APXS_CFLAGS=$APXS -q CFLAGS + APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET + + # Test that we're trying to configure with apache 1.x + APACHE_VERSION=$APXS_HTTPD -v | head -1 | cut -f3 -d' ' | cut -f2 -d'/' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' + if test "$APACHE_VERSION" -ge 2000000; then + AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) + fi + for flag in $APXS_CFLAGS; do case $flag in -D*) CPPFLAGS="$CPPFLAGS $flag";; esac done PHP_ADD_INCLUDE($APXS_INCLUDEDIR) - - # Test that we're trying to configure with apache 1.x - if test -f "$APXS_INCLUDEDIR/ap_mpm.h"; then - AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) - fi PHP_SAPI=apache Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.6.2.2 php4/sapi/apache2filter/config.m4:1.6.2.3 --- php4/sapi/apache2filter/config.m4:1.6.2.2 Fri Apr 12 20:18:54 2002 +++ php4/sapi/apache2filter/config.m4 Thu Apr 25 23:13:00 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6.2.2 2002/04/13 00:18:54 sniper Exp $ +dnl $Id: config.m4,v 1.6.2.3 2002/04/26 03:13:00 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -31,6 +31,16 @@ AC_MSG_ERROR([Aborting]) fi + APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET + + # Test that we're trying to configure with apache 2.x + APACHE_VERSION=$APXS_HTTPD -v | head -1 | cut -f3 -d' ' | cut -f2 -d'/' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' + if test "$APACHE_VERSION" -le 2000000; then + AC_MSG_ERROR([Use --with-apxs with Apache 1.3.x!]) + elif test "$APACHE_VERSION" -lt 2000035; then + AC_MSG_ERROR([Apache version >= 2.0.35 required.]) + fi + APXS_INCLUDEDIR=$APXS -q INCLUDEDIR APXS_CFLAGS=$APXS -q CFLAGS for flag in $APXS_CFLAGS; do @@ -38,11 +48,6 @@ -D*) CPPFLAGS="$CPPFLAGS $flag";; esac done - - # Test that we're trying to configure with apache 2.x - if test ! -f "$APXS_INCLUDEDIR/ap_mpm.h"; then - AC_MSG_ERROR([Use --with-apxs with Apache 1.3.x!]) - fi PHP_ADD_INCLUDE($APXS_INCLUDEDIR) PHP_SAPI=apache2filter