3acf4c24e2
Source general-purpose scripting language that is especially suited for Web development and can be embedded into HTML. Its syntax draws upon C, Java, and Perl, and is easy to learn. The main goal of the language is to allow web developers to write dynamically generated webpages quickly, but you can do much more with PHP. WWW: http://www.php.net/ PR: 145772 Submitted by: Alex Keda
55 lines
2.4 KiB
Text
55 lines
2.4 KiB
Text
--- 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(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)
|
|
|
|
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_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*)
|
|
@@ -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)"
|
|
;;
|
|
*)
|
|
- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
|
|
+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
|
|
;;
|
|
esac
|
|
|
|
+ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
|
|
+ PHP_INSTALL_CGI_TARGET="install-cgi"
|
|
PHP_SUBST(BUILD_CGI)
|
|
+ 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
|
|
+ else
|
|
+ AC_MSG_RESULT(no)
|
|
+ if test "$PHP_SAPI" = "default" ; then
|
|
+ if test "$PHP_CLI" != "no" ; then
|
|
OVERALL_TARGET=
|
|
PHP_SAPI=cli
|
|
else
|
|
AC_MSG_ERROR([No SAPIs selected.])
|
|
fi
|
|
+ fi
|
|
fi
|