diff options
| author | foobar <sniper@php.net> | 2004-04-07 13:56:33 (GMT) |
|---|---|---|
| committer | foobar <sniper@php.net> | 2004-04-07 13:56:33 (GMT) |
| commit | f1823e58daa8c6994a708216e45a69bb1f5c0b99 (patch) | |
| tree | 351627d5396f3e7ec59bc4bd3e8058fe1fd4cf72 /configure.in | |
| parent | 59f0817205b1fdbb569d1025283c39aecf709130 (diff) | |
| download | php-f1823e58daa8c6994a708216e45a69bb1f5c0b99.tar.gz | |
Revert the patch to "fix" #27664 and added more informal error msg.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 49d660b..edb768e 100644 --- a/configure.in +++ b/configure.in @@ -868,15 +868,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 @@ -884,7 +884,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 @@ -1055,8 +1055,6 @@ if test "$PHP_SAPI_CLI" != "no"; 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) |