- Fix for bug: #16791. (more reliable test)

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 497bbeafdd8e2f4d10c415272ed7204e47f1de02..c38bd4940e97c16734057b38cb3168581a1fc0bf 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -33,6 +33,14 @@ AC_ARG_WITH(apxs,
   APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
   APXS_CFLAGS=`$APXS -q CFLAGS`
+  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;}'`
+  if test "$APACHE_VERSION" -ge 2000000; then
+    AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) 
+  fi
+
   for flag in $APXS_CFLAGS; do
     case $flag in
     -D*) CPPFLAGS="$CPPFLAGS $flag";;
@@ -45,7 +53,6 @@ AC_ARG_WITH(apxs,
     PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR)
     ;;
   *darwin*)
-    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
     MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
     PHP_SUBST(MH_BUNDLE_FLAGS)
     SAPI_SHARED=libs/libphp4.so
@@ -56,11 +63,6 @@ AC_ARG_WITH(apxs,
     ;;
   esac
 
-  # Test that we're trying to configure with apache 1.x
-  if test -f "$APXS_INCLUDEDIR/ap_mpm.h"; then
-    AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) 
-  fi
-
   # Test whether apxs support -S option
   $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
 

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index ca9a485dd61ce9ec742d59b54234b20623e369e3..921b2ab8a481b1a91136b1fd9a75704ec4df9889 100644 (file)
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -32,13 +32,23 @@ AC_ARG_WITH(apxs2,
   fi 
 
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
+  APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
   APXS_CFLAGS=`$APXS -q CFLAGS`
+
   for flag in $APXS_CFLAGS; do
     case $flag in
     -D*) CPPFLAGS="$CPPFLAGS $flag";;
     esac
   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;}'`
+  if test "$APACHE_VERSION" -le 2000000; then
+    AC_MSG_ERROR([Use --with-apxs with Apache 1.3.x!])
+  elif test "$APACHE_VERSION" -lt 2000035; then
+    AC_MSG_ERROR([Apache version >= 2.0.35 required.])
+  fi
+
   case $host_alias in
   *aix*)
     APXS_SBINDIR=`$APXS -q SBINDIR`
@@ -47,7 +57,6 @@ AC_ARG_WITH(apxs2,
     INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL" 
     ;;
   *darwin*)
-    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
     MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD"
     PHP_SUBST(MH_BUNDLE_FLAGS)
     PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c)
@@ -59,11 +68,6 @@ AC_ARG_WITH(apxs2,
     INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"
     ;;
   esac
-    
-  # Test that we're trying to configure with apache 2.x
-  if test ! -f "$APXS_INCLUDEDIR/ap_mpm.h"; then
-    AC_MSG_ERROR([Use --with-apxs with Apache 1.3.x!])
-  fi
 
   PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
   PHP_BUILD_THREAD_SAFE