sniper Mon Mar 14 16:11:46 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS configure.in
Log:
MFH
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.856&r2=1.1247.2.857&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.856 php-src/NEWS:1.1247.2.857
--- php-src/NEWS:1.1247.2.856 Mon Mar 14 16:01:01 2005
+++ php-src/NEWS Mon Mar 14 16:11:44 2005
@@ -17,6 +17,8 @@
- 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
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.154&r2=1.396.2.155&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.154 php-src/configure.in:1.396.2.155
--- php-src/configure.in:1.396.2.154 Sun Mar 13 16:54:54 2005
+++ php-src/configure.in Mon Mar 14 16:11:45 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.154 2005/03/13 21:54:54 iliaa Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.396.2.155 2005/03/14 21:11:45 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -81,6 +81,10 @@
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 -------------------------------------------------------------------------
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
