Enable extensions to specify that they are not supposed to be

built with the CLI SAPI. This is done by passing "nocli" as the
3rd parameter to PHP_EXTENSION macro.

acinclude.m4

@@ -930,6 +930,8 @@ dnl "extname" is the name of the ext/ subdir where the extension resides
 dnl "shared" can be set to "shared" or "yes" to build the extension as
 dnl a dynamically loadable library. Optional parameter "sapi_class" can
 dnl be set to "cli" to mark extension build only with CLI or CGI sapi's.
+dnl If "nocli" is passed the extension will be built only with a non-cli
+dnl sapi.
 dnl
 AC_DEFUN(PHP_EXTENSION,[
   EXT_SUBDIRS="$EXT_SUBDIRS $1"
@@ -949,6 +951,10 @@ dnl ---------------------------------------------- Static module
     LIB_BUILD($ext_builddir)
     EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
     EXT_STATIC="$EXT_STATIC $1"
+    if test "$3" != "nocli"; then
+      EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
+      EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
+    fi
   else
     if test "$2" = "shared" || test "$2" = "yes"; then
 dnl ---------------------------------------------- Shared module
@@ -958,15 +964,14 @@ dnl ---------------------------------------------- Shared module
   fi
 
   if test "$2" != "shared" && test "$2" != "yes" && test "$3" = "cli"; then
-dnl ---------------------------------------------- CLI static module
+dnl ---------------------------------------------- CLI only static module
     LIB_BUILD($ext_builddir)
     if test "$PHP_SAPI" = "cgi"; then
       EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
       EXT_STATIC="$EXT_STATIC $1"
-    else
-      EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
-      EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
     fi
+    EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
+    EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
   fi
 
   PHP_FAST_OUTPUT($ext_builddir/Makefile)

configure.in

@@ -1118,7 +1118,7 @@ dnl mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null
   sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c
 
   echo "creating main/internal_functions_cli.c"
-  cli_extensions="$EXT_STATIC $EXT_CLI_STATIC"
+  cli_extensions="$EXT_CLI_STATIC"
   sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c
 
 dnl  if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then

sapi/cli/Makefile.in

@@ -5,7 +5,6 @@ LTLIBRARY_DEPENDENCIES = \
 		$(top_builddir)/Zend/libZend.la \
 		$(top_builddir)/main/libmain_cli.la \
 		$(top_builddir)/$(REGEX_LIB) \
-		$(EXT_LTLIBS) \
 		$(EXT_CLI_LTLIBS) \
 		$(top_builddir)/$(TSRM_LIB)