sniper Thu May 24 23:31:15 2007 UTC
Modified files:
/php-src configure.in
/php-src/sapi/cgi config9.m4
Log:
MFB:- Unify installation of SAPIs: CGI is no exception anymore.
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.626&r2=1.627&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.626 php-src/configure.in:1.627
--- php-src/configure.in:1.626 Thu May 24 21:43:56 2007
+++ php-src/configure.in Thu May 24 23:31:15 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.626 2007/05/24 21:43:56 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.627 2007/05/24 23:31:15 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1196,9 +1196,6 @@
install_targets="$install_modules install-build install-headers
install-programs"
case $PHP_SAPI in
- cgi)
- install_targets="install-sapi $install_targets"
- ;;
cli)
install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
;;
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config9.m4?r1=1.22&r2=1.23&diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.22 php-src/sapi/cgi/config9.m4:1.23
--- php-src/sapi/cgi/config9.m4:1.22 Tue Feb 20 20:10:53 2007
+++ php-src/sapi/cgi/config9.m4 Thu May 24 23:31:15 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.22 2007/02/20 20:10:53 tony2001 Exp $
+dnl $Id: config9.m4,v 1.23 2007/05/24 23:31:15 sniper Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -44,15 +44,15 @@
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
case $host_alias in
*cygwin* )
- SAPI_CGI_PATH=sapi/cgi/php.exe
+ SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
;;
* )
- SAPI_CGI_PATH=sapi/cgi/php
+ SAPI_CGI_PATH=sapi/cgi/php-cgi
;;
esac
PHP_SUBST(SAPI_CGI_PATH)
- INSTALL_IT="@echo \"Installing PHP CGI into:
\$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH)
\$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
+ INSTALL_IT="@echo \"Installing PHP CGI into:
\$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH)
\$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, ,
'$(SAPI_CGI_PATH)')
case $host_alias in
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
