From 7380c23ab24844b8d8e9f0675672f7b020fe6a8a Mon Sep 17 00:00:00 2001 From: foobar Date: Mon, 14 Mar 2005 21:11:45 +0000 Subject: [PATCH] MFH --- NEWS | 2 ++ configure.in | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index ba8e52e8b5273..5cef0c6aa5ce3 100644 --- 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 d01e1ab8d3d13..4eedb7ba03faf 100644 --- 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 -------------------------------------------------------------------------