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

jwoolley Fri May 17 04:07:15 2002 EDT Modified files: /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: Allow the version checks for --with-apxs= and --with-apxs2= to work with development version of Apache, whose version strings end in "-dev", eg "Apache/2.0.37-dev". PR: 17233 Submitted by: Dale Ghent <daleg@elemental.org> Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.55 php4/sapi/apache/config.m4:1.56 --- php4/sapi/apache/config.m4:1.55 Fri Apr 26 17:26:42 2002 +++ php4/sapi/apache/config.m4 Fri May 17 04:07:13 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55 2002/04/26 21:26:42 sas Exp $ +dnl $Id: config.m4,v 1.56 2002/05/17 08:07:13 jwoolley Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -36,7 +36,7 @@ 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;}' + 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;}' 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.16 php4/sapi/apache2filter/config.m4:1.17 --- php4/sapi/apache2filter/config.m4:1.16 Mon May 13 17:37:52 2002 +++ php4/sapi/apache2filter/config.m4 Fri May 17 04:07:14 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.16 2002/05/13 21:37:52 markonen Exp $ +dnl $Id: config.m4,v 1.17 2002/05/17 08:07:14 jwoolley Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -42,7 +42,7 @@ done # 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;}' + 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;}' 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 2000035; then