cvs: php-src / acinclude.m4
| From: | Jani Taskinen | Date: | Sat, 09 May 2009 20:26:28 +0000 |
| Subject: | cvs: php-src / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-57649@lists.php.net to get a copy of this message | ||
jani Sat May 9 20:26:28 2009 UTC
Modified files:
/php-src acinclude.m4
Log:
- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi)
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.392&r2=1.393&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.392 php-src/acinclude.m4:1.393
--- php-src/acinclude.m4:1.392 Thu Dec 4 00:41:17 2008
+++ php-src/acinclude.m4 Sat May 9 20:26:28 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.392 2008/12/04 00:41:17 dsp Exp $
+dnl $Id: acinclude.m4,v 1.393 2009/05/09 20:26:28 jani Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -920,7 +920,7 @@
])
dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]]]]])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags [, cxx [,
zend_ext]]]]])
dnl
dnl Includes an extension in the build.
dnl
@@ -968,12 +968,15 @@
if test "$3" != "shared" && test "$3" != "yes"
&& test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
- if test "$PHP_SAPI" = "cgi"; then
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
- EXT_STATIC="$EXT_STATIC $1"
- else
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
- fi
+ case "$PHP_SAPI" in
+ cgi|embed[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+ EXT_STATIC="$EXT_STATIC $1"
+ ;;
+ *[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)