cvs: php4 / configure.in /sapi/cli config.m4

edink Tue Jun 11 05:36:00 2002 EDT Modified files: /php4 configure.in /php4/sapi/cli config.m4 Log: Disable installing pear when --disable-cli is used since pear installer needs cli to function. Index: php4/configure.in diff -u php4/configure.in:1.352 php4/configure.in:1.353 --- php4/configure.in:1.352 Fri Jun 7 08:19:22 2002 +++ php4/configure.in Tue Jun 11 05:35:50 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.352 2002/06/07 12:19:22 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.353 2002/06/11 09:35:50 edink Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -642,7 +642,7 @@ [ --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 Index: php4/sapi/cli/config.m4 diff -u php4/sapi/cli/config.m4:1.5 php4/sapi/cli/config.m4:1.6 --- php4/sapi/cli/config.m4:1.5 Sat Apr 13 23:57:59 2002 +++ php4/sapi/cli/config.m4 Tue Jun 11 05:35:59 2002 @@ -1,11 +1,12 @@ dnl -dnl $Id: config.m4,v 1.5 2002/04/14 03:57:59 sniper Exp $ +dnl $Id: config.m4,v 1.6 2002/06/11 09:35:59 edink Exp $ 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 ],[