Commit 44fe4a2b authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent 8b230f0b

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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 = \

acinclude.m4

+1 −0
Original line number Diff line number Diff line
@@ -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)

configure.in

+6 −1
Original line number Diff line number Diff line
@@ -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)