MFH

diff --git a/NEWS b/NEWS
index ba8e52e8b5273edb307899dc5a529cd70910836e..5cef0c6aa5ce30d4443af1bf0acc9d4ad48fcdc5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ PHP 4                                                                      NEWS
 - Fixed several leaks in ext/filepro. (Tony)
 - Fixed build system to always use bundled libtool files. (Jani)  
 - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter).
+  (Jani)
 - Fixed bug #32160 (file truncation in copy() when source & destination are
   the same). (Ilia)
 - Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns

diff --git a/configure.in b/configure.in
index d01e1ab8d3d13e9b829004943bb5ef008ff32f76..4eedb7ba03faf7942eb8edbaff1223cbf5622d6a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -81,6 +81,10 @@ if test -n "$with_apache" && test -n "$with_apxs"; then
   AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together])
 fi
 
+if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then
+  AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together])
+fi
+
 
 dnl Settings we want to make before the checks.
 dnl -------------------------------------------------------------------------