diff options
Diffstat (limited to 'lang/php5/files/patch-acinclude.m4')
| -rw-r--r-- | lang/php5/files/patch-acinclude.m4 | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/lang/php5/files/patch-acinclude.m4 b/lang/php5/files/patch-acinclude.m4 index 14396604f6e6..9c4094b8fd82 100644 --- a/lang/php5/files/patch-acinclude.m4 +++ b/lang/php5/files/patch-acinclude.m4 @@ -1,10 +1,33 @@ ---- acinclude.m4.orig Sat Dec 24 12:38:05 2005 -+++ acinclude.m4 Mon Jan 16 12:20:17 2006 -@@ -1021,12 +1021,6 @@ +--- acinclude.m4.orig Mon Apr 10 14:17:36 2006 ++++ acinclude.m4 Thu May 4 08:10:56 2006 +@@ -194,7 +194,7 @@ + dnl + dnl which array to append to? + AC_DEFUN([PHP_ADD_SOURCES],[ +- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) ++ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS)))) + ]) + + dnl +@@ -966,12 +966,8 @@ + 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 ++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) + EXT_CLI_STATIC="$EXT_CLI_STATIC $1" + fi + PHP_ADD_BUILD_DIR($ext_builddir) +@@ -1021,12 +1017,6 @@ build to be successful. ]) fi -- if test "x$is_it_shared" = "x" && test "x$3" != "xtrue"; then +- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then - AC_MSG_ERROR([ -You've configured extension $1, which depends on extension $2, -but you've either not enabled $2, or have disabled it. @@ -13,7 +36,7 @@ dnl Some systems require that we link $2 to $1 when building ]) -@@ -2151,9 +2145,9 @@ +@@ -2158,9 +2148,9 @@ test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no dnl Fallbacks for different configure options |