sniper Thu May 24 23:29:59 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS configure.in
/php-src/sapi/cgi config9.m4
Log:
- Unify installation of SAPIs: CGI is no exception anymore.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.731&r2=1.2027.2.547.2.732&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.731 php-src/NEWS:1.2027.2.547.2.732
--- php-src/NEWS:1.2027.2.547.2.731 Tue May 22 19:31:07 2007
+++ php-src/NEWS Thu May 24 23:29:59 2007
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2007, PHP 5.2.3
+- Changed CGI install target to php-cgi and 'make install' to install CLI
+ when CGI is selected. (Jani)
- Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
- Optimized out a couple of per-request syscalls (Rasmus)
- Optimized digest generation in md5() and sha1() functions. (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.52&r2=1.579.2.52.2.53&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.52
php-src/configure.in:1.579.2.52.2.53
--- php-src/configure.in:1.579.2.52.2.52 Thu May 24 21:40:41 2007
+++ php-src/configure.in Thu May 24 23:29:59 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.52 2007/05/24 21:40:41 sniper Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.53 2007/05/24 23:29:59 sniper Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1298,9 +1298,6 @@
install_targets="$install_modules install-build install-headers
install-programs $install_pear"
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.17.2.2.2.3&r2=1.17.2.2.2.4&diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.17.2.2.2.3
php-src/sapi/cgi/config9.m4:1.17.2.2.2.4
--- php-src/sapi/cgi/config9.m4:1.17.2.2.2.3 Mon May 21 08:47:51 2007
+++ php-src/sapi/cgi/config9.m4 Thu May 24 23:29:59 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.17.2.2.2.3 2007/05/21 08:47:51 dmitry Exp $
+dnl $Id: config9.m4,v 1.17.2.2.2.4 2007/05/24 23:29:59 sniper Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -58,10 +58,10 @@
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)
@@ -105,7 +105,7 @@
AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ])
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
- 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 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)')
case $host_alias in
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
