sniper Tue Jul 1 13:03:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src configure.in
/php-src/sapi/cgi Makefile.frag config9.m4
Log:
MFH: Separate CGI install from install-sapi.
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.57 php-src/configure.in:1.396.2.58
--- php-src/configure.in:1.396.2.57 Fri Jun 27 03:07:03 2003
+++ php-src/configure.in Tue Jul 1 13:03:55 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.57 2003/06/27 07:07:03 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.58 2003/07/01 17:03:55 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1103,10 +1103,22 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $install_pear install-build
install-headers install-programs"
-if test "$PHP_SAPI" != "cgi"; then
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-fi
+install_targets="install-modules $install_pear install-build install-headers
install-programs"
+
+case $PHP_SAPI in
+ cgi)
+ dnl Install CGI only (CLI is not installed even if it's enabled)
+ install_targets="install-cgi $install_targets"
+ ;;
+ cli)
+ dnl Install CLI only (--disable-cgi used, no other SAPIs enabled)
+ install_targets="install-cli $install_targets"
+ ;;
+ *)
+ dnl Install CLI and another SAPI
+ install_targets="$PHP_INSTALL_CLI_TARGET install-sapi $install_targets"
+ ;;
+esac
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
Index: php-src/sapi/cgi/Makefile.frag
diff -u php-src/sapi/cgi/Makefile.frag:1.1 php-src/sapi/cgi/Makefile.frag:1.1.2.1
--- php-src/sapi/cgi/Makefile.frag:1.1 Sun Sep 29 12:22:48 2002
+++ php-src/sapi/cgi/Makefile.frag Tue Jul 1 13:03:55 2003
@@ -1,2 +1,6 @@
$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(BUILD_CGI)
+
+install-cgi: $(SAPI_CGI_PATH)
+ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
+ @$(INSTALL_CGI)
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.1.2.6 php-src/sapi/cgi/config9.m4:1.1.2.7
--- php-src/sapi/cgi/config9.m4:1.1.2.6 Fri May 30 21:37:44 2003
+++ php-src/sapi/cgi/config9.m4 Tue Jul 1 13:03:55 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.1.2.6 2003/05/31 01:37:44 sniper Exp $
+dnl $Id: config9.m4,v 1.1.2.7 2003/07/01 17:03:55 sniper Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -148,7 +148,6 @@
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"
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,
$PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
case $host_alias in
@@ -159,8 +158,10 @@
BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
+ INSTALL_CGI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755
\$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
PHP_SUBST(BUILD_CGI)
+ PHP_SUBST(INSTALL_CGI)
elif test "$PHP_SAPI_CLI" != "no"; then
AC_MSG_RESULT(no)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
