cvs: php4 /sapi/apache config.m4

rasmus Fri Jun 28 19:57:16 2002 EDT Modified files: /php4/sapi/apache config.m4 Log: Fix for bug #18055 Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.56 php4/sapi/apache/config.m4:1.57 --- php4/sapi/apache/config.m4:1.56 Fri May 17 04:07:13 2002 +++ php4/sapi/apache/config.m4 Fri Jun 28 19:57:15 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.56 2002/05/17 08:07:13 jwoolley Exp $ +dnl $Id: config.m4,v 1.57 2002/06/28 23:57:15 rasmus Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -36,7 +36,8 @@ 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'/' | cut -f1 -d'-' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' +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;}' 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