Fix the progname stuff to work the same way the rest of the configure

scheme works.
Submitted by:	Sascha Schumann
Reviewed by:	Ryan Bloom

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

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

diff --git a/configure.in b/configure.in
index ed071bb1dfcc52ed0beab0970a7fb9959967739d..2c3eb0476f413d725cfd25676d61d0410cc5bd1f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -143,6 +143,7 @@ EXTRA_LIBS="$EXTRA_LIBS $LIBS"
 EXTRA_LDFLAGS="$LDFLAGS"
 LIBS=""
 LDFLAGS=""
+APACHE_SUBST(progname)
 APACHE_SUBST(EXTRA_CFLAGS)
 APACHE_SUBST(EXTRA_LDFLAGS)
 APACHE_SUBST(EXTRA_LIBS)
@@ -162,6 +163,11 @@ if test "$apache_need_shared" = "yes"; then
   $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
 fi
 
+AC_ARG_WITH(program-name,
+[  --with-program-name=alternate executable name],[
+  progname="$withval" ], [
+  progname="httpd"] )
+
 APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
             modules/Makefile os/Makefile)
 APACHE_FAST_GENERATE
@@ -170,11 +176,6 @@ 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
@@ -197,6 +198,6 @@ bindir=$bindir
 progname=$progname
 ])
 
-AC_OUTPUT($APACHE_OUTPUT_FILES Makefile)
+AC_OUTPUT($APACHE_OUTPUT_FILES)