Hi,
On Wed, 2009-05-06 at 20:42 +0100, Paul Biggar wrote:
> Hi folks,
>
> Could I get someone to look at http://bugs.php.net/bug.php?id=47468?.
> It includes a patch which is confirmed to fix the problem.
Does the following patch works for you ? (use ./buildconf after
applying, then reconfigure). It does the same thing as yours, but moves
the decision of allowing "cli" extensions to SAPI's config.m4.
Lukas, Johannes, any objection ?
Regards,
Arnaud
Index: acinclude.m4
===================================================================
RCS file: /repository/php-src/acinclude.m4,v
retrieving revision 1.332.2.14.2.26.2.12
diff -u -p -r1.332.2.14.2.26.2.12 acinclude.m4
--- acinclude.m4 3 Dec 2008 19:53:45 -0000 1.332.2.14.2.26.2.12
+++ acinclude.m4 8 May 2009 12:38:11 -0000
@@ -877,15 +877,17 @@ EOF
])
dnl
-dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
+dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target [,
allow-static-exts]]]])
dnl
dnl Selects the SAPI name and type (static, shared, programm)
dnl and optionally also the source-files for the SAPI-specific
dnl objects.
dnl
+dnl allow-static-exts: Whether SAPI allows any extension to be built
statically ([yes], all)
+dnl
AC_DEFUN([PHP_SELECT_SAPI],[
PHP_SAPI=$1
-
+
case "$2" in
static[)] PHP_BUILD_STATIC;;
shared[)] PHP_BUILD_SHARED;;
@@ -894,6 +896,12 @@ AC_DEFUN([PHP_SELECT_SAPI],[
esac
ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+
+ case "$6" in
+ [yes|all)] PHP_SAPI_ALLOWS_STATIC_EXTS="$6";;
+ ["")] PHP_SAPI_ALLOWS_STATIC_EXTS=yes;;
+ esac
+
])
dnl deprecated
@@ -968,7 +976,7 @@ dnl ------------------------------------
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
+ if test "$PHP_SAPI_ALLOWS_STATIC_EXTS" = "all"; then
PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
EXT_STATIC="$EXT_STATIC $1"
else
Index: sapi/cgi/config9.m4
===================================================================
RCS file: /repository/php-src/sapi/cgi/config9.m4,v
retrieving revision 1.17.2.2.2.6.2.2
diff -u -p -r1.17.2.2.2.6.2.2 config9.m4
--- sapi/cgi/config9.m4 1 Oct 2007 12:40:54 -0000 1.17.2.2.2.6.2.2
+++ sapi/cgi/config9.m4 8 May 2009 12:38:14 -0000
@@ -54,7 +54,7 @@ if test "$PHP_SAPI" = "default"; then
dnl Set install target and select SAPI
INSTALL_IT="@echo \"Installing PHP CGI binary:
\$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH)
\$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
- PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
+ PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)',
all)
case $host_alias in
*aix*)
Index: sapi/embed/config.m4
===================================================================
RCS file: /repository/php-src/sapi/embed/config.m4,v
retrieving revision 1.9.4.2
diff -u -p -r1.9.4.2 config.m4
--- sapi/embed/config.m4 11 Jul 2007 23:20:36 -0000 1.9.4.2
+++ sapi/embed/config.m4 8 May 2009 12:38:14 -0000
@@ -23,7 +23,7 @@ if test "$PHP_EMBED" != "no"; then
;;
esac
if test "$PHP_EMBED_TYPE" != "no"; then
- PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c)
+ PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c, , , all)
PHP_INSTALL_HEADERS([sapi/embed/php_embed.h])
fi
AC_MSG_RESULT([$PHP_EMBED_TYPE])
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
