You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/04/25 23:29:28 UTC
cvs commit: apache-2.0/src Makefile.in configure.in acinclude.m4
rbb 00/04/25 14:29:27
Modified: src Makefile.in configure.in acinclude.m4
Log:
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.
Revision Changes Path
1.8 +1 -1 apache-2.0/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 2000/04/04 13:31:12 1.7
+++ Makefile.in 2000/04/25 21:29:27 1.8
@@ -6,7 +6,7 @@
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 = \
1.33 +6 -1 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- configure.in 2000/04/14 14:32:18 1.32
+++ configure.in 2000/04/25 21:29:27 1.33
@@ -162,6 +162,11 @@
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 @@
bindir=$bindir
])
-AC_OUTPUT($APACHE_OUTPUT_FILES)
+AC_OUTPUT($APACHE_OUTPUT_FILES Makefile)
1.23 +1 -0 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- acinclude.m4 2000/04/13 11:03:20 1.22
+++ acinclude.m4 2000/04/25 21:29:27 1.23
@@ -46,6 +46,7 @@
APACHE_SUBST(includedir)
APACHE_SUBST(iconsdir)
APACHE_SUBST(sysconfdir)
+ APACHE_SUBST(progname)
APACHE_SUBST(prefix)
APACHE_SUBST(CC)
APACHE_SUBST(CFLAGS)