diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 06:29:31 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 06:29:31 +0000 |
| commit | 3de4c7d7991400cff20b779573e64eaa4d5ac0a3 (patch) | |
| tree | 17a972961c3aba262b2d978e41f17fed9a1e4621 /lang/php5/files/patch-sapi_cgi_config9.m4 | |
| parent | The Java Service Wrapper is an application which has evolved out of a desire (diff) | |
Update to 5.2.4 release.
Notes
Notes:
svn path=/head/; revision=199477
Diffstat (limited to 'lang/php5/files/patch-sapi_cgi_config9.m4')
| -rw-r--r-- | lang/php5/files/patch-sapi_cgi_config9.m4 | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lang/php5/files/patch-sapi_cgi_config9.m4 b/lang/php5/files/patch-sapi_cgi_config9.m4 index d3f012498cd6..c40894155cc8 100644 --- a/lang/php5/files/patch-sapi_cgi_config9.m4 +++ b/lang/php5/files/patch-sapi_cgi_config9.m4 @@ -1,26 +1,26 @@ ---- sapi/cgi/config9.m4.orig Thu Feb 2 10:59:23 2006 -+++ sapi/cgi/config9.m4 Thu May 4 11:19:41 2006 -@@ -80,7 +80,6 @@ - ]) - - +--- sapi/cgi/config9.m4.orig Thu Jul 12 01:20:36 2007 ++++ sapi/cgi/config9.m4 Wed Sep 5 07:55:06 2007 +@@ -25,7 +25,6 @@ + dnl + dnl CGI setup + dnl -if test "$PHP_SAPI" = "default"; then - AC_MSG_CHECKING(for CGI build) - if test "$PHP_SAPI_CGI" != "no"; then + AC_MSG_CHECKING(whether to build CGI binary) + if test "$PHP_CGI" != "no"; then AC_MSG_RESULT(yes) -@@ -145,8 +144,9 @@ - AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) - AC_MSG_RESULT($PHP_ENABLE_FASTCGI) +@@ -85,8 +84,9 @@ + AC_MSG_RESULT($PHP_PATH_INFO_CHECK) + 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, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)') -+ INSTALL_CGI="@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, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)') ++ INSTALL_CGI="@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_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi) + PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) case $host_alias in *aix*) -@@ -156,17 +156,29 @@ +@@ -96,17 +96,29 @@ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ;; *) @@ -37,7 +37,7 @@ + PHP_SUBST(PHP_CGI_TARGET) + PHP_SUBST(PHP_INSTALL_CGI_TARGET) -- elif test "$PHP_SAPI_CLI" != "no"; then +- elif test "$PHP_CLI" != "no"; then - AC_MSG_RESULT(no) + if test "$PHP_SAPI" = "default" ; then + PHP_BUILD_PROGRAM($SAPI_CGI_PATH) @@ -45,7 +45,7 @@ + else + AC_MSG_RESULT(no) + if test "$PHP_SAPI" = "default" ; then -+ if test "$PHP_SAPI_CLI" != "no" ; then ++ if test "$PHP_CLI" != "no" ; then OVERALL_TARGET= PHP_SAPI=cli else |