cvs: php4 / Makefile.in acinclude.m4 configure.in /ext/ircg config.m4

sas Thu Jan 24 07:55:08 2002 EDT Modified files: /php4 configure.in Makefile.in acinclude.m4 /php4/ext/ircg config.m4 Log: Don't build CLI, if an extension requests that. In this case, the ircg extension refers to thttpd-specific symbols which causes the build of the cli sapi module to fail. Index: php4/configure.in diff -u php4/configure.in:1.290 php4/configure.in:1.291 --- php4/configure.in:1.290 Sat Jan 19 21:30:17 2002 +++ php4/configure.in Thu Jan 24 07:55:08 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.290 2002/01/20 02:30:17 edink Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.291 2002/01/24 12:55:08 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -844,6 +844,13 @@ PHP_OS=uname AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) +if test "$disable_cgi" = "1"; then + CLI_DIR= +else + CLI_DIR=sapi/cli +fi + +PHP_SUBST(CLI_DIR) PHP_SUBST(EXT_SUBDIRS) PHP_SUBST(EXT_STATIC) Index: php4/Makefile.in diff -u php4/Makefile.in:1.104 php4/Makefile.in:1.105 --- php4/Makefile.in:1.104 Sun Jan 13 00:26:19 2002 +++ php4/Makefile.in Thu Jan 24 07:55:08 2002 @@ -1,6 +1,6 @@ ZEND_DIR = $(srcdir)/Zend -SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) sapi/cli . $(PEAR_DIR) +SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_DIR) . $(PEAR_DIR) LTLIBRARY_NAME = libphp4.la LTLIBRARY_SOURCES = stub.c Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.152 php4/acinclude.m4:1.153 --- php4/acinclude.m4:1.152 Mon Jan 21 11:49:31 2002 +++ php4/acinclude.m4 Thu Jan 24 07:55:08 2002 @@ -1,9 +1,16 @@ -dnl $Id: acinclude.m4,v 1.152 2002/01/21 16:49:31 hholzgra Exp $ +dnl $Id: acinclude.m4,v 1.153 2002/01/24 12:55:08 sas Exp $ dnl dnl This file contains local autoconf functions. sinclude(dynlib.m4) +dnl +dnl Disable building CLI +dnl +AC_DEFUN(PHP_DISABLE_CLI,[ + disable_cli=1 +]) + dnl dnl Separator into the configure --help display. dnl Index: php4/ext/ircg/config.m4 diff -u php4/ext/ircg/config.m4:1.8 php4/ext/ircg/config.m4:1.9 --- php4/ext/ircg/config.m4:1.8 Fri Nov 30 13:59:41 2001 +++ php4/ext/ircg/config.m4 Thu Jan 24 07:55:08 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2001/11/30 18:59:41 sniper Exp $ +dnl $Id: config.m4,v 1.9 2002/01/24 12:55:08 sas Exp $ dnl PHP_ARG_WITH(ircg, for IRCG support, @@ -22,6 +22,7 @@ PHP_ADD_INCLUDE($PHP_IRCG/include) if test "$PHP_SAPI" = "thttpd"; then AC_DEFINE(IRCG_WITH_THTTPD, 1, [Whether thttpd is available]) + PHP_DISABLE_CLI fi AC_DEFINE(HAVE_IRCG, 1, [Whether you want IRCG support]) PHP_EXTENSION(ircg, $ext_shared)