summaryrefslogtreecommitdiff
path: root/sapi/apache
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2002-07-07 15:43:45 +0000
committerfoobar <sniper@php.net>2002-07-07 15:43:45 +0000
commit2ca9ae687dd82e0faa2b4674fdb5bc5f1bfc2080 (patch)
tree2488772ec839e126b70a05bda9c4b58b3d6ff202 /sapi/apache
parent9ba62685e10f483cd9d006ad438491a297b3ad1c (diff)
downloadphp-git-2ca9ae687dd82e0faa2b4674fdb5bc5f1bfc2080.tar.gz
- Fix the version check again.
Diffstat (limited to 'sapi/apache')
-rw-r--r--sapi/apache/config.m43
1 files changed, 1 insertions, 2 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 200ace1f06..90f4cdaedf 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -36,8 +36,7 @@ AC_ARG_WITH(apxs,
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
# Test that we're trying to configure with apache 1.x
-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;}'`
+ 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;}'`
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