From: foobar <sniper@php.net>
Date: Fri, 12 Apr 2002 22:59:07 +0000 (+0000)
Subject: - Added checks to prevent building the DSO with wrong configure option.
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~680
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f81166f34e104753121bc65a6448727692a70f6c;p=php

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

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 57f1236520..cd5dbebb45 100644
--- 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 cf9331cb46..8b6ace11a1 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)
   INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"
   PHP_BUILD_THREAD_SAFE