Allow the Apache-2.0 executable name to be specified with the

--with-program-name command line argument to configure.  This does not
change the name of the config files or anything else, yet.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85035 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 93ea431e34a49b0ead28579afb62fd379e9854ce..5e4396e789b8c3315d2cbb6cf9c7d1f446454df1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 
 SUBDIRS = ap lib main modules os $(REGEX_DIR)
 
-PROGRAM_NAME         = httpd
+PROGRAM_NAME         = @progname@
 PROGRAM_SOURCES      = modules.c buildmark.c
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
 PROGRAM_DEPENDENCIES = \

diff --git a/acinclude.m4 b/acinclude.m4
index dd38f5150ba93484a276968889aa3e98b5eeb15b..2113a9423edf98bf1ff78c1af9a094b33306c9d1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -46,6 +46,7 @@ AC_DEFUN(APACHE_FAST_GENERATE,[
   APACHE_SUBST(includedir)
   APACHE_SUBST(iconsdir)
   APACHE_SUBST(sysconfdir)
+  APACHE_SUBST(progname)
   APACHE_SUBST(prefix)
   APACHE_SUBST(CC)
   APACHE_SUBST(CFLAGS)

diff --git a/configure.in b/configure.in
index 797198f6a6cd6fffad8a3366f2a444e100d4164b..3a2a4a741f786be6537429f2df5e7146be7e618e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -162,6 +162,11 @@ dnl ## Build modules.c
 rm -f $srcdir/modules.c
 echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
 
+AC_ARG_WITH(program-name,
+[  --with-program-name=alternate executable name],[
+  progname="$withval" ], [
+  progname='httpd'] )
+
 AC_OUTPUT_COMMANDS([
 echo '/* Generated by configure */' > ${path_h}.new
 echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
@@ -182,6 +187,6 @@ exec_prefix=$exec_prefix
 bindir=$bindir
 ])
 
-AC_OUTPUT($APACHE_OUTPUT_FILES)
+AC_OUTPUT($APACHE_OUTPUT_FILES Makefile)