From: foobar <sniper@php.net>
Date: Sat, 29 Jun 2002 00:33:02 +0000 (+0000)
Subject: Better fix it here too..
X-Git-Tag: php-4.3.0dev_zend2_alpha2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=999d9aa10f9fb43e95c93baba14feb068ade3313;p=php

Better fix it here too..
---

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 2cfff4bc2e..32c9d39956 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -43,7 +43,7 @@ AC_ARG_WITH(apxs2,
   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