Here is the patch against PHP_4_3 that implements the Unix side of
changes.
Edin
On Thu, 19 Dec 2002, Andrei Zmievski wrote:
> This gets my complete support. Let's go ahead with the changes.
>
> On Thu, 19 Dec 2002, Edin Kadribasic wrote:
> > After having consulted with Andrei, Derick and others on irc here is
> > a proposal for a compromise:
> >
> > On Unix:
> >
> > 1. Both cgi and cli are built as 'php' in their respective sapi
> > directories (pretty much as it is today except that cgi gets renamed
> > back from php-cgi to just php).
> > 2. Make install will *not* install cli if cgi build was selected
> > (only cgi gets installed).
> > 3. A new install target 'install-cli' is introduced so that make
> > install-cli will overwrite whatever is in $(PREFIX)/bin/php.
> >
> > On Windows:
> >
> > 1. php.exe in the root of distribution is php cgi sapi.
> > 2. New cli directory is included with php.exe (cli) in it.
> >
> > If this is an acceptable compromise I volunteer to do the changes
> > required.
>
> -Andrei http://www.gravitonic.com/
> * The great thing about standards is that there are so many to choose from. *
>
>
Index: configure.in
===================================================================
RCS file: /repository/php4/configure.in,v
retrieving revision 1.396.2.15
diff -u -3 -p -r1.396.2.15 configure.in
--- configure.in 13 Dec 2002 13:34:37 -0000 1.396.2.15
+++ configure.in 19 Dec 2002 16:45:38 -0000
@@ -1081,7 +1081,11 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $PHP_INSTALL_CLI_TARGET $install_pear"
+install_targets="install-sapi install-modules $install_pear"
+if test "$PHP_SAPI" != "cgi"; then
+ install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+fi
+
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
Index: sapi/cgi/config9.m4
===================================================================
RCS file: /repository/php4/sapi/cgi/config9.m4,v
retrieving revision 1.1.2.2
diff -u -3 -p -r1.1.2.2 config9.m4
--- sapi/cgi/config9.m4 9 Dec 2002 17:25:01 -0000 1.1.2.2
+++ sapi/cgi/config9.m4 19 Dec 2002 16:45:38 -0000
@@ -88,10 +88,10 @@ if test "$PHP_SAPI" = "default"; then
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
case $host_alias in
*cygwin* )
- SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
+ SAPI_CGI_PATH=sapi/cgi/php.exe
;;
* )
- SAPI_CGI_PATH=sapi/cgi/php-cgi
+ SAPI_CGI_PATH=sapi/cgi/php
;;
esac
PHP_SUBST(SAPI_CGI_PATH)
@@ -147,7 +147,7 @@ if test "$PHP_SAPI" = "default"; then
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
- INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH)
\$(INSTALL_ROOT)\$(bindir)/php-cgi"
+ INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,
-I$PHP_FCGI_INCLUDE,'$(SAPI_CGI_PATH)')
case $host_alias in
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
