MFH

diff --git a/NEWS b/NEWS
index b4b195bfefe931fdc9a0ae1dab32c733a7214912..a4814fc6b043da2a59c820be001f41fe1e46f560 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 

diff --git a/configure.in b/configure.in
index f0583304e0bfecf53b0239e785532ca74b0483a1..c0c45f1e3cd31fd50c16aa16d1cbed490684b84f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -900,6 +900,8 @@ unset LIBS LDFLAGS
 
 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_OLD(php_abs_top_srcdir)
 
 PHP_SUBST(bindir)
 PHP_SUBST(exec_prefix)
+PHP_SUBST(program_prefix)
+PHP_SUBST(program_suffix)
 PHP_SUBST(includedir)
 PHP_SUBST(libdir)
 PHP_SUBST(mandir)

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 2fbad1fdc17344a24e9d8212eaaeeaa3729c6681..1d786bfbaa08d6bd4ccd6dd5266e2b69bf4a80f6 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -149,7 +149,7 @@ if test "$PHP_SAPI" = "default"; then
     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

diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 2b2c76f457a61491510d17d8746a63e4cd2468ca..a3f9f1684c433f00b9b4bc191328043cc945bd27 100644 (file)
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -30,7 +30,7 @@ if test "$PHP_SAPI_CLI" != "no"; then
     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)

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 374d409ddac30366f3465a607e752cc31ecd926a..13b92c96625ce9d4d9c749113b3442a602a0fda5 100644 (file)
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -52,12 +52,12 @@ install-headers:
 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