- Remove PHP_DISABLE_CLI

- Streamline ircg build: thttpd-dependent part moved into separate source
  file, so that it can be added to the SAPI-only object list.

diff --git a/acinclude.m4 b/acinclude.m4
index 6908696165ecd6d3440a1f7c3ccdad0e5d009cf0..93a5d943410e0c0d1746c0e03dc6dd019fe66f80 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -137,13 +137,6 @@ EOF
   done
 ])
 
-dnl
-dnl Disable building CLI
-dnl
-AC_DEFUN([PHP_DISABLE_CLI],[
-  disable_cli=1
-])
-       
 dnl
 dnl Separator into the configure --help display.
 dnl 

diff --git a/configure.in b/configure.in
index 7cd79b7339575bd1afdc32a101cb90cde8de00ee..cc71a074db1a5ffca32e75f319789b6f72724dc9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -607,7 +607,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, no)
 
-if test "$PHP_PEAR" != "no" && test "$disable_cli" != "1"; then
+if test "$PHP_PEAR" != "no" && test "$PHP_SAPI_CLI" != "no"; then
   install_pear="install-pear install-build install-headers install-programs"
   PEAR_INSTALLDIR=$PHP_PEAR
 fi
@@ -957,7 +957,7 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 PHP_OS=`uname | xargs`
 AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
 
-if test "$disable_cli" != "1"; then
+if test "$PHP_SAPI_CLI" != "no"; then
   PHP_CLI_TARGET=sapi/cli/php
   PHP_INSTALL_CLI_TARGET="install-cli"
   PHP_ADD_SOURCES(sapi/cli, php_cli.c getopt.c,, cli)

diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 17af168c2eaa3a5c888846dde9a264b85f70d438..1fa569d0b12809a201da199e7e061836c95fb6cc 100644 (file)
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -29,8 +29,6 @@ if test "$PHP_SAPI_CLI" != "no"; then
   INSTALL_CLI="\$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
   PHP_SUBST(BUILD_CLI)
   PHP_SUBST(INSTALL_CLI)
-else
-  PHP_DISABLE_CLI
 fi
 
 AC_MSG_RESULT($PHP_SAPI_CLI)