rbb 00/04/25 16:20:37
Modified: src CHANGES Makefile.in configure.in
Log:
If a developer uses --with-program-name=foo, the config files are renamed
to match the name of the executable. In this example, httpd.conf will be
renamed to foo.conf.
Revision Changes Path
1.81 +4 -0 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- CHANGES 2000/04/24 04:03:38 1.80
+++ CHANGES 2000/04/25 23:20:36 1.81
@@ -1,4 +1,8 @@
Changes with Apache 2.0a3-dev
+ *) The configure option --with-program-name has been added to allow
+ developers to rename the executable at configure time. This also
+ changes the name of the config files to match the executable's name.
+ [Ryan Bloom]
*) mod_autoindex: Add `IndexOptions +VersionSort', to nicely sort filenames
containing version numbers. [Martin Pool]
1.9 +3 -0 apache-2.0/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/04/25 21:29:27 1.8
+++ Makefile.in 2000/04/25 23:20:36 1.9
@@ -40,6 +40,9 @@
< $$i > $(sysconfdir)/$$i; \
chmod 0644 $(sysconfdir)/$$i; \
file=`echo $$i|sed s/-dist//`; \
+ if [ "$$file" = "httpd.conf" ]; then \
+ file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+ fi; \
if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
fi; \
1.34 +3 -1 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.in 2000/04/25 21:29:27 1.33
+++ configure.in 2000/04/25 23:20:36 1.34
@@ -165,12 +165,13 @@
AC_ARG_WITH(program-name,
[ --with-program-name=alternate executable name],[
progname="$withval" ], [
- progname='httpd'] )
+ progname="httpd"] )
AC_OUTPUT_COMMANDS([
echo '/* Generated by configure */' > ${path_h}.new
echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
echo "#define SUEXEC_BIN \"$bindir/suexec\"" >> ${path_h}.new
+echo "#define SERVER_CONFIG_FILE \"conf/$progname.conf\"" >> ${path_h}.new
cmp ${path_h}.new ${path_h} >/dev/null 2>&1
if test $? -ne 0 ; then
@@ -185,6 +186,7 @@
prefix=$prefix
exec_prefix=$exec_prefix
bindir=$bindir
+progname=$progname
])
AC_OUTPUT($APACHE_OUTPUT_FILES Makefile)
|