From: foobar Date: Wed, 7 Apr 2004 13:56:48 +0000 (+0000) Subject: MFH: Revert the patch to "fix" #27664 and added more informal error msg. X-Git-Tag: php-4.3.6RC3~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf45f6d5bac99132fe05a70f2e0f4f424b22a515;p=php MFH: Revert the patch to "fix" #27664 and added more informal error msg. --- diff --git a/NEWS b/NEWS index 7bf57af47d..db28b98e58 100644 --- a/NEWS +++ b/NEWS @@ -29,7 +29,6 @@ PHP 4 NEWS - 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) diff --git a/configure.in b/configure.in index 39d3e31cfb..742826cd1d 100644 --- a/configure.in +++ b/configure.in @@ -857,15 +857,15 @@ if test "$PHP_PEAR" != "no"; then 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 ext/xmlrpc is not really there yet to be a requirement.. 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 @@ if test "$disable_cli" != "1"; then 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)