diff options
| author | Edin Kadribasic <edink@php.net> | 2002-01-30 23:46:44 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2002-01-30 23:46:44 +0000 |
| commit | 13ca3321840456dbdcab69bdcb84d8e563b93720 (patch) | |
| tree | 07e560c7ab42c7c451c349c78cc3971d7353a2e9 | |
| parent | 860e2e97eea24e5fe7a9aada5dfb1f7aadc9ff56 (diff) | |
| download | php-git-13ca3321840456dbdcab69bdcb84d8e563b93720.tar.gz | |
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.
| -rw-r--r-- | acinclude.m4 | 13 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | sapi/cli/Makefile.in | 1 |
3 files changed, 10 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index cb99efb3b7..96ee42f354 100644 --- a/acinclude.m4 +++ b/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) diff --git a/configure.in b/configure.in index b49b785c4a..e2378710fd 100644 --- a/configure.in +++ b/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 diff --git a/sapi/cli/Makefile.in b/sapi/cli/Makefile.in index a58aab9000..515c57fcbe 100644 --- a/sapi/cli/Makefile.in +++ b/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) |