sniper Wed Apr 7 09:56:50 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS configure.in
Log:
MFH: Revert the patch to "fix" #27664 and added more informal error msg.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.631&r2=1.1247.2.632&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.631 php-src/NEWS:1.1247.2.632
--- php-src/NEWS:1.1247.2.631 Tue Apr 6 14:12:03 2004
+++ php-src/NEWS Wed Apr 7 09:56:46 2004
@@ -29,7 +29,6 @@
- Fixed bug #27717 (Test Failures when compiled on 64-bit mode). (Ard, Derick)
- Fixed bug #27687 (Bug Adding Default Charset to 'text/*' Content-Type
Header). (Marcus)
-- Fixed bug #27664 (--disable-cli doesn't force --without-pear). (Ilia)
- Fixed bug #27663 (compile failure with cURL 7.11.1). (Ilia)
- Fixed bug #27646 (Cannot serialize/unserialize non-finite numeric values).
(Marcus)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.107&r2=1.396.2.108&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.107 php-src/configure.in:1.396.2.108
--- php-src/configure.in:1.396.2.107 Mon Apr 5 11:43:52 2004
+++ php-src/configure.in Wed Apr 7 09:56:48 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.107 2004/04/05 15:43:52 iliaa Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.108 2004/04/07 13:56:48 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -857,15 +857,15 @@
dnl
if test "$PHP_SAPI_CLI" = "no"; then
pear_error_msg="$pear_error_msg
- PEAR requires CLI to be enabled. Add --enable-cli to the
configure line."
+ PEAR requires CLI to be enabled. Add --enable-cli to the
configure line. (or --disable-pear)"
fi
if test "$PHP_PCRE_REGEX" = "no"; then
pear_error_msg="$pear_error_msg
- PEAR requires PCRE to be enabled. Add --with-pcre-regex to the
configure line."
+ PEAR requires PCRE to be enabled. Add --with-pcre-regex to the
configure line. (or --disable-pear)"
fi
if test "$PHP_XML" = "no"; then
pear_error_msg="$pear_error_msg
- PEAR requires XML to be enabled. Add --enable-xml to the
configure line."
+ PEAR requires XML to be enabled. Add --enable-xml to the
configure line. (or --disable-pear)"
fi
dnl
@@ -873,7 +873,7 @@
dnl
dnl if test "$PHP_XMLRPC" = "no"; then
dnl pear_error_msg="$pear_error_msg
-dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the
configure line."
+dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the
configure line. (or --disable-pear)"
dnl fi
dnl
@@ -1044,8 +1044,6 @@
PHP_CLI_TARGET="\$(SAPI_CLI_PATH)"
PHP_INSTALL_CLI_TARGET="install-cli"
PHP_ADD_SOURCES(sapi/cli, php_cli.c getopt.c,, cli)
-else
- with_pear=no
fi
PHP_SUBST(PHP_CLI_TARGET)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
