diff options
| author | Edin Kadribasic <edink@php.net> | 2002-06-11 09:35:59 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2002-06-11 09:35:59 +0000 |
| commit | acae873a6b396b015fd14f16276539a57a630ff7 (patch) | |
| tree | 1e6375a85420edb8ac6f4727b23a13de92d34e30 | |
| parent | b7cab12d21ec51e9d36a198a6135c35521c18c47 (diff) | |
| download | php-git-acae873a6b396b015fd14f16276539a57a630ff7.tar.gz | |
Disable installing pear when --disable-cli is used since pear installer
needs cli to function.
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | sapi/cli/config.m4 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 51bb09adf1..ba3451c92a 100644 --- a/configure.in +++ b/configure.in @@ -642,7 +642,7 @@ PHP_ARG_WITH(pear, [whether to install PEAR, and where], [ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php) --without-pear Do not install PEAR], DEFAULT) -if test "$PHP_PEAR" != "no"; then +if test "$PHP_PEAR" != "no" && test "$disable_cli" != "1"; then install_pear="install-pear install-build install-headers install-programs" PEAR_INSTALLDIR=$PHP_PEAR fi diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index 4b5086c17c..49aae6f58e 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -5,7 +5,8 @@ dnl AC_MSG_CHECKING(for CLI build) AC_ARG_ENABLE(cli, -[ --disable-cli Disable building CLI version of PHP.], +[ --disable-cli Disable building CLI version of PHP + (this forces --without-pear).], [ PHP_SAPI_CLI=$enableval ],[ |