diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-07-27 15:13:54 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-07-27 15:13:54 +0000 |
| commit | 49a746ede788f5fcf95cd62f98fd891625d15840 (patch) | |
| tree | f774949ed5b9db04e5310ffa8f9254c07cc012f3 /lang/php5/files/patch-acinclude.m4 | |
| parent | Really fix includes. (diff) | |
Update to 5.3.3 release:
- add FPM sapi (experimental) [1]
- add apache2filter sapi (experimental)
PR: ports/148956 [1]
Submitted by: mm
Notes
Notes:
svn path=/head/; revision=258339
Diffstat (limited to 'lang/php5/files/patch-acinclude.m4')
| -rw-r--r-- | lang/php5/files/patch-acinclude.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lang/php5/files/patch-acinclude.m4 b/lang/php5/files/patch-acinclude.m4 index 4f9a9462f947..d92738cdf776 100644 --- a/lang/php5/files/patch-acinclude.m4 +++ b/lang/php5/files/patch-acinclude.m4 @@ -5,11 +5,11 @@ 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)))) ++ 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,ifelse($4,fpm,PHP_FPM_OBJS,PHP_GLOBAL_OBJS))))) ]) dnl -@@ -968,15 +968,8 @@ +@@ -968,15 +968,9 @@ if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then dnl ---------------------------------------------- CLI static module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no @@ -23,10 +23,11 @@ - ;; - esac + PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) ++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm) EXT_CLI_STATIC="$EXT_CLI_STATIC $1" fi PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1026,12 +1019,6 @@ +@@ -1026,12 +1020,6 @@ build to be successful. ]) fi @@ -39,7 +40,7 @@ dnl Some systems require that we link $2 to $1 when building ]) -@@ -2303,9 +2290,9 @@ +@@ -2303,9 +2291,9 @@ test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no dnl Fallbacks for different configure options |