sniper Wed Apr 7 09:56:35 2004 EDT
Modified files:
/php-src configure.in
Log:
Revert the patch to "fix" #27664 and added more informal error msg.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.499&r2=1.500&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.499 php-src/configure.in:1.500
--- php-src/configure.in:1.499 Fri Mar 26 14:47:19 2004
+++ php-src/configure.in Wed Apr 7 09:56:33 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.499 2004/03/26 19:47:19 iliaa Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.500 2004/04/07 13:56:33 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -868,15 +868,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
@@ -884,7 +884,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
@@ -1055,8 +1055,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
