Disable installing pear when --disable-cli is used since pear installer

needs cli to function.

diff --git a/configure.in b/configure.in
index 51bb09adf18c7e5a84f6f7c715a1e31c7bdbf2fb..ba3451c92a532285135d5a5a2275d00f435c4166 100644 (file)
--- 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 4b5086c17ce731a22159b112540c09e886d18bca..49aae6f58ecb627734ca9994480607a9364c29e0 100644 (file)
--- 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
 ],[