From: Sascha Schumann Date: Thu, 24 Jan 2002 12:55:08 +0000 (+0000) Subject: Don't build CLI, if an extension requests that. X-Git-Tag: PRE_ISSET_PATCH~99 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0b8ac114280275d002b931a4284e95c5b3438d0;p=php 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. --- diff --git a/Makefile.in b/Makefile.in index 749a522c34..b15f0f1440 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/acinclude.m4 b/acinclude.m4 index fedcddf92a..40575afddc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4,6 +4,13 @@ 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 diff --git a/configure.in b/configure.in index 88dfe5df0f..6a930a7bb3 100644 --- a/configure.in +++ b/configure.in @@ -844,6 +844,13 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) 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)