summaryrefslogtreecommitdiff
path: root/sapi/apache
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2002-06-28 23:57:15 +0000
committerRasmus Lerdorf <rasmus@php.net>2002-06-28 23:57:15 +0000
commit02022179c914df99f1e5a9d32c749b978c92b7cf (patch)
tree96f79b86cee4599de683bc4bcaedd04c0e13465f /sapi/apache
parented6b43582ecc70b5aeced245d5c07af6529efda4 (diff)
downloadphp-git-02022179c914df99f1e5a9d32c749b978c92b7cf.tar.gz
Fix for bug #18055
Diffstat (limited to 'sapi/apache')
-rw-r--r--sapi/apache/config.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index f0d1fae255..999d5d091d 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -36,7 +36,8 @@ AC_ARG_WITH(apxs,
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