cvs: php4 /sapi/apache config.m4 /sapi/apache2filter config.m4

sniper Sun Jul 7 11:43:45 2002 EDT Modified files: /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: - Fix the version check again. Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.58 php4/sapi/apache/config.m4:1.59 --- php4/sapi/apache/config.m4:1.58 Fri Jun 28 20:12:46 2002 +++ php4/sapi/apache/config.m4 Sun Jul 7 11:43:44 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.58 2002/06/29 00:12:46 rasmus Exp $ +dnl $Id: config.m4,v 1.59 2002/07/07 15:43:44 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -36,8 +36,7 @@ APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET # Test that we're trying to configure with apache 1.x -dnl APACHE_VERSION=$APXS_HTTPD -v | head -1 | cut -f3 -d' ' | cut -f2 -d'/' | cut -f1 -d'-' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' - APACHE_VERSION=$APXS_HTTPD -v | head -1 | awk 'BEGIN { RS=" "; } /Apache/ { print $0; }' | cut -f2 -d'/' | cut -f1 -d'-' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' + APACHE_VERSION=$APXS_HTTPD -v | head -1 | awk 'BEGIN { RS=" "; } /Apache/ { print $1; }' | cut -f2 -d'/' | cut -f1 -d'-' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' if test "$APACHE_VERSION" -ge 2000000; then AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) fi Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.21 php4/sapi/apache2filter/config.m4:1.22 --- php4/sapi/apache2filter/config.m4:1.21 Fri Jun 28 20:33:02 2002 +++ php4/sapi/apache2filter/config.m4 Sun Jul 7 11:43:45 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2002/06/29 00:33:02 sniper Exp $ +dnl $Id: config.m4,v 1.22 2002/07/07 15:43:45 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -43,7 +43,7 @@ done # Test that we're trying to configure with apache 2.x - APACHE_VERSION=$APXS_HTTPD -v | head -1 | awk 'BEGIN { RS=" "; } /Apache/ { print $0; }' | cut -f2 -d'/' | cut -f1 -d'-' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' + APACHE_VERSION=$APXS_HTTPD -v | head -1 | awk 'BEGIN { RS=" "; } /Apache/ { print $1; }' | cut -f2 -d'/' | cut -f1 -d'-' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' if test "$APACHE_VERSION" -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) elif test "$APACHE_VERSION" -lt 2000040; then