cvs: php4 / acinclude.m4 configure.in /sapi/cli Makefile.in

edink Wed Jan 30 18:46:45 2002 EDT Modified files: /php4 acinclude.m4 configure.in /php4/sapi/cli Makefile.in Log: 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. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.155 php4/acinclude.m4:1.156 --- php4/acinclude.m4:1.155 Sat Jan 26 22:37:02 2002 +++ php4/acinclude.m4 Wed Jan 30 18:46:44 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.155 2002/01/27 03:37:02 markonen Exp $ +dnl $Id: acinclude.m4,v 1.156 2002/01/30 23:46:44 edink Exp $ dnl dnl This file contains local autoconf functions. @@ -930,6 +930,8 @@ 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 @@ 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 @@ 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) Index: php4/configure.in diff -u php4/configure.in:1.295 php4/configure.in:1.296 --- php4/configure.in:1.295 Sat Jan 26 18:57:17 2002 +++ php4/configure.in Wed Jan 30 18:46:44 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.295 2002/01/26 23:57:17 markonen Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.296 2002/01/30 23:46:44 edink Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1118,7 +1118,7 @@ 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 Index: php4/sapi/cli/Makefile.in diff -u php4/sapi/cli/Makefile.in:1.6 php4/sapi/cli/Makefile.in:1.7 --- php4/sapi/cli/Makefile.in:1.6 Sat Jan 19 21:30:18 2002 +++ php4/sapi/cli/Makefile.in Wed Jan 30 18:46:44 2002 @@ -5,7 +5,6 @@ $(top_builddir)/Zend/libZend.la \ $(top_builddir)/main/libmain_cli.la \ $(top_builddir)/$(REGEX_LIB) \ - $(EXT_LTLIBS) \ $(EXT_CLI_LTLIBS) \ $(top_builddir)/$(TSRM_LIB)