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

sas Thu Jul 11 04:44:42 2002 EDT Modified files: /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: Use a simple IFS; set step to interprete the httpd -v output Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.59 php4/sapi/apache/config.m4:1.60 --- php4/sapi/apache/config.m4:1.59 Sun Jul 7 11:43:44 2002 +++ php4/sapi/apache/config.m4 Thu Jul 11 04:44:42 2002 @@ -1,7 +1,17 @@ dnl -dnl $Id: config.m4,v 1.59 2002/07/07 15:43:44 sniper Exp $ +dnl $Id: config.m4,v 1.60 2002/07/11 08:44:42 sas Exp $ dnl +AC_DEFUN(PHP_AP_EXTRACT_VERSION,[ + ac_IFS=$IFS +IFS="- /. +" + set $1 -v 2>&1 + IFS=$ac_IFS + + APACHE_VERSION=expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6 +]) + AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) AC_ARG_WITH(apxs, [ --with-apxs[=FILE] Build shared Apache 1.x module. FILE is the optional @@ -36,7 +46,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 | awk 'BEGIN { RS=" "; } /Apache/ { print $1; }' | cut -f2 -d'/' | cut -f1 -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([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.22 php4/sapi/apache2filter/config.m4:1.23 --- php4/sapi/apache2filter/config.m4:1.22 Sun Jul 7 11:43:45 2002 +++ php4/sapi/apache2filter/config.m4 Thu Jul 11 04:44:42 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.22 2002/07/07 15:43:45 sniper Exp $ +dnl $Id: config.m4,v 1.23 2002/07/11 08:44:42 sas 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 $1; }' | cut -f2 -d'/' | cut -f1 -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([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