From: foobar <sniper@php.net>
Date: Sat, 13 Apr 2002 00:18:54 +0000 (+0000)
Subject: MFH.
X-Git-Tag: php-4.2.0RC4~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9905ed2b0508f297f87ae2529834e3002d98e544;p=php

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 c098062e72..92699a1e58 100644
--- 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 c92f3a640f..354a5f97ca 100644
--- 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"