cvs: php-src(PHP_4_3) / NEWS configure.in /sapi/cgi config9.m4 /sapi/cli config.m4 /scripts Makefile.frag

sniper Mon Dec 1 11:12:45 2003 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS configure.in /php-src/sapi/cgi config9.m4 /php-src/sapi/cli config.m4 /php-src/scripts Makefile.frag Log: MFH Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.487 php-src/NEWS:1.1247.2.488 --- php-src/NEWS:1.1247.2.487 Sun Nov 30 04:39:48 2003 +++ php-src/NEWS Mon Dec 1 11:12:35 2003 @@ -1,6 +1,8 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2003, Version 4.3.5 +- Added support for --program-prefix and --program-suffix configure options. + (Jani) - Fixed header handler in NSAPI SAPI module (header->replace was ignored, send_default_content_type now sends value from php.ini). (Uwe Schindler) - Fixed bug #26467 (flock() does not force the "wouldblock" parameter to be Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.88 php-src/configure.in:1.396.2.89 --- php-src/configure.in:1.396.2.88 Sat Nov 29 08:35:32 2003 +++ php-src/configure.in Mon Dec 1 11:12:36 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.88 2003/11/29 13:35:32 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.89 2003/12/01 16:12:36 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -900,6 +900,8 @@ test "$prefix" = "NONE" && prefix=/usr/local test "$exec_prefix" = "NONE" && exec_prefix='${prefix}' +test "$program_prefix" = "NONE" && program_prefix= +test "$program_suffix" = "NONE" && program_suffix= case $libdir in '${exec_prefix}/lib') @@ -1025,6 +1027,8 @@ PHP_SUBST(bindir) PHP_SUBST(exec_prefix) +PHP_SUBST(program_prefix) +PHP_SUBST(program_suffix) PHP_SUBST(includedir) PHP_SUBST(libdir) PHP_SUBST(mandir) Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.1.2.11 php-src/sapi/cgi/config9.m4:1.1.2.12 --- php-src/sapi/cgi/config9.m4:1.1.2.11 Fri Oct 3 01:25:46 2003 +++ php-src/sapi/cgi/config9.m4 Mon Dec 1 11:12:38 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.1.2.11 2003/10/03 05:25:46 sniper Exp $ +dnl $Id: config9.m4,v 1.1.2.12 2003/12/01 16:12:38 sniper Exp $ dnl AC_ARG_ENABLE(cgi, @@ -149,7 +149,7 @@ AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) 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)/php" + INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') case $host_alias in Index: php-src/sapi/cli/config.m4 diff -u php-src/sapi/cli/config.m4:1.11.2.5 php-src/sapi/cli/config.m4:1.11.2.6 --- php-src/sapi/cli/config.m4:1.11.2.5 Mon Sep 8 09:10:34 2003 +++ php-src/sapi/cli/config.m4 Mon Dec 1 11:12:40 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11.2.5 2003/09/08 13:10:34 sniper Exp $ +dnl $Id: config.m4,v 1.11.2.6 2003/12/01 16:12:40 sniper Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -30,7 +30,7 @@ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; esac - INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php" + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" PHP_SUBST(BUILD_CLI) PHP_SUBST(INSTALL_CLI) Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.1.2.6 php-src/scripts/Makefile.frag:1.1.2.7 --- php-src/scripts/Makefile.frag:1.1.2.6 Fri Nov 7 20:09:11 2003 +++ php-src/scripts/Makefile.frag Mon Dec 1 11:12:42 2003 @@ -52,12 +52,12 @@ install-programs: $(builddir)/phpize $(builddir)/php-config @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/" @for prog in $(bin_SCRIPTS); do \ - echo " program: $$prog"; \ - $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + echo " program: $(program_prefix)$$prog$(program_suffix)"; \ + $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done @for prog in $(bin_src_SCRIPTS); do \ - echo " program: $$prog"; \ - $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + echo " program: $(program_prefix)$$prog$(program_suffix)"; \ + $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status