From ce2268f43dff83cf950b1e8c1d0d29c93e3b58e6 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Tue, 25 Apr 2000 21:29:27 +0000 Subject: [PATCH] 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 --- Makefile.in | 2 +- acinclude.m4 | 1 + configure.in | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 93ea431e34a..5e4396e789b 100644 --- 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 dd38f5150ba..2113a9423ed 100644 --- 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 797198f6a6c..3a2a4a741f7 100644 --- 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) -- 2.47.2