diff options
| author | Cliff Woolley <jwoolley@php.net> | 2002-05-17 08:07:14 +0000 |
|---|---|---|
| committer | Cliff Woolley <jwoolley@php.net> | 2002-05-17 08:07:14 +0000 |
| commit | 8283979afc0ebfa61d1adbbe5dd56144c3961009 (patch) | |
| tree | f1b32a5b351e1d47734353e88bdd22540785450b | |
| parent | 34d471d22e1bd1ae957c40280303ee65d6c4ce0e (diff) | |
| download | php-git-8283979afc0ebfa61d1adbbe5dd56144c3961009.tar.gz | |
Allow the version checks for --with-apxs= and --with-apxs2= to work
with development version of Apache, whose version strings end in "-dev",
eg "Apache/2.0.37-dev".
PR: 17233
Submitted by: Dale Ghent <daleg@elemental.org>
| -rw-r--r-- | sapi/apache/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/config.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index cb56d9c24e..f0d1fae255 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -36,7 +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 - APACHE_VERSION=`$APXS_HTTPD -v | head -1 | cut -f3 -d' ' | cut -f2 -d'/' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + 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;}'` 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 diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index 7a3b91b04f..76248f6f8c 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -42,7 +42,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'/' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + 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;}'` 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 2000035; then |