cvs: php4 /sapi/apache2filter config.m4
| From: | Jani Taskinen | Date: | Sat, 29 Jun 2002 00:33:02 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12613@lists.php.net to get a copy of this message | ||
sniper Fri Jun 28 20:33:02 2002 EDT
Modified files:
/php4/sapi/apache2filter config.m4
Log:
Better fix it here too..
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.20 php4/sapi/apache2filter/config.m4:1.21
--- php4/sapi/apache2filter/config.m4:1.20 Fri Jun 28 10:48:37 2002
+++ php4/sapi/apache2filter/config.m4 Fri Jun 28 20:33:02 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.20 2002/06/28 14:48:37 sniper Exp $
+dnl $Id: config.m4,v 1.21 2002/06/29 00:33:02 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 | 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" -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