cvs: php4 / configure.in /sapi/cgi config9.m4
| From: | Edin Kadribasic | Date: | Thu, 19 Dec 2002 17:02:40 +0000 |
| Subject: | cvs: php4 / configure.in /sapi/cgi config9.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17278@lists.php.net to get a copy of this message | ||
edink Thu Dec 19 12:02:40 2002 EDT
Modified files:
/php4 configure.in
/php4/sapi/cgi config9.m4
Log:
MFB:
Making build system changes according to proposal:
http://news.php.net/article.php?group=php.dev&article=92682
Index: php4/configure.in
diff -u php4/configure.in:1.408 php4/configure.in:1.409
--- php4/configure.in:1.408 Fri Dec 13 05:32:03 2002
+++ php4/configure.in Thu Dec 19 12:02:39 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.408 2002/12/13 10:32:03 helly Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.409 2002/12/19 17:02:39 edink Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1081,7 +1081,11 @@
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: php4/sapi/cgi/config9.m4
diff -u php4/sapi/cgi/config9.m4:1.4 php4/sapi/cgi/config9.m4:1.5
--- php4/sapi/cgi/config9.m4:1.4 Mon Dec 9 12:02:38 2002
+++ php4/sapi/cgi/config9.m4 Thu Dec 19 12:02:40 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.4 2002/12/09 17:02:38 msopacua Exp $
+dnl $Id: config9.m4,v 1.5 2002/12/19 17:02:40 edink Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -88,10 +88,10 @@
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 @@
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