MFH.

(Prevent users from trying to build Apache 1.x module with Apache 2.x and
vice-versa)

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index c098062e72351f3fdd9cd27a53f9e32ab86e1d0a..92699a1e5830738d267bf8a44c7158796027101b 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -39,6 +39,12 @@ AC_ARG_WITH(apxs,
     esac
   done
   PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
+
+  # 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
+
   PHP_SAPI=apache
 
   # Test whether apxs support -S option

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index c92f3a640f57047b13907e82c98c23e5a7b7e87f..354a5f97ca9b9beba372d3f459cd0203fdede00b 100644 (file)
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -38,6 +38,12 @@ AC_ARG_WITH(apxs2,
     -D*) CPPFLAGS="$CPPFLAGS $flag";;
     esac
   done
+  
+  # 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_SAPI=apache2filter
   INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"