- Added checks to prevent building the DSO with wrong configure option.

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 57f1236520a0b6bbaf4976c249d8680f99d561e4..cd5dbebb4597698c88cf2ce7a2091aee078dd73a 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -55,6 +55,12 @@ AC_ARG_WITH(apxs,
     PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c)
     ;;
   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
+
   PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
 
   # Test whether apxs support -S option

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index cf9331cb4664f38c7a5f6603c757a3442bafc382..8b6ace11a18d6708766e76fa706186f4c8ccc6ca 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)
   INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"
   PHP_BUILD_THREAD_SAFE