diff options
Diffstat (limited to 'lang/php53/files/patch-sapi_cgi_config9.m4')
| -rw-r--r-- | lang/php53/files/patch-sapi_cgi_config9.m4 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lang/php53/files/patch-sapi_cgi_config9.m4 b/lang/php53/files/patch-sapi_cgi_config9.m4 index c40894155cc8..7682dad43110 100644 --- a/lang/php53/files/patch-sapi_cgi_config9.m4 +++ b/lang/php53/files/patch-sapi_cgi_config9.m4 @@ -1,6 +1,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 @@ +--- sapi/cgi/config9.m4.orig 2007-10-01 14:40:54.000000000 +0200 ++++ sapi/cgi/config9.m4 2008-09-25 23:07:13.000000000 +0200 +@@ -8,7 +8,6 @@ dnl dnl CGI setup dnl @@ -8,19 +8,19 @@ AC_MSG_CHECKING(whether to build CGI binary) if test "$PHP_CGI" != "no"; then AC_MSG_RESULT(yes) -@@ -85,8 +84,9 @@ - AC_MSG_RESULT($PHP_PATH_INFO_CHECK) +@@ -53,8 +52,9 @@ + PHP_SUBST(SAPI_CGI_PATH) 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)') +- PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.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(sapi/cgi, cgi_main.c fastcgi.c,, cgi) + PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) case $host_alias in *aix*) -@@ -96,17 +96,29 @@ +@@ -64,17 +64,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)" ;; *) @@ -32,13 +32,14 @@ + PHP_CGI_TARGET="\$(SAPI_CGI_PATH)" + PHP_INSTALL_CGI_TARGET="install-cgi" PHP_SUBST(BUILD_CGI) +- +- elif test "$PHP_CLI" != "no"; then +- AC_MSG_RESULT(no) + PHP_SUBST(INSTALL_CGI) + PHP_SUBST(PHP_CGI_OBJS) + PHP_SUBST(PHP_CGI_TARGET) + PHP_SUBST(PHP_INSTALL_CGI_TARGET) - -- elif test "$PHP_CLI" != "no"; then -- AC_MSG_RESULT(no) ++ + if test "$PHP_SAPI" = "default" ; then + PHP_BUILD_PROGRAM($SAPI_CGI_PATH) + fi |