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

sniper Sun Jul 28 22:15:19 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4 acinclude.m4 /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: MFH: Fix for Apache version check. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.157.2.7 php4/acinclude.m4:1.157.2.8 --- php4/acinclude.m4:1.157.2.7 Sat Jul 6 20:47:46 2002 +++ php4/acinclude.m4 Sun Jul 28 22:15:18 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.157.2.7 2002/07/07 00:47:46 sniper Exp $ +dnl $Id: acinclude.m4,v 1.157.2.8 2002/07/29 02:15:18 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1263,4 +1263,21 @@ $2 ifelse([$3],[],,[else $3]) fi +]) + + +dnl +dnl PHP_AP_EXTRACT_VERSION(/path/httpd) +dnl This macro is used to get a comparable +dnl version for apache1/2. +dnl +AC_DEFUN(PHP_AP_EXTRACT_VERSION,[ + ac_output=$1 -v 2>&1 + ac_IFS=$IFS +IFS="- /. +" + set $ac_output + IFS=$ac_IFS + + APACHE_VERSION=expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6 ]) Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.47.2.3 php4/sapi/apache/config.m4:1.47.2.4 --- php4/sapi/apache/config.m4:1.47.2.3 Thu Apr 25 23:12:59 2002 +++ php4/sapi/apache/config.m4 Sun Jul 28 22:15:19 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47.2.3 2002/04/26 03:12:59 sniper Exp $ +dnl $Id: config.m4,v 1.47.2.4 2002/07/29 02:15:19 sniper 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;}' + PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test "$APACHE_VERSION" -ge 2000000; then AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) fi Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.6.2.3 php4/sapi/apache2filter/config.m4:1.6.2.4 --- php4/sapi/apache2filter/config.m4:1.6.2.3 Thu Apr 25 23:13:00 2002 +++ php4/sapi/apache2filter/config.m4 Sun Jul 28 22:15:19 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6.2.3 2002/04/26 03:13:00 sniper Exp $ +dnl $Id: config.m4,v 1.6.2.4 2002/07/29 02:15:19 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -34,7 +34,7 @@ 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;}' + PHP_AP_EXTRACT_VERSION($APXS_HTTPD) 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