rse 98/04/21 08:23:39
Modified: . STATUS INSTALL configure
src CHANGES
Log:
Provide backward-compatibility for some src/Configuration.tmpl parameter names
to the canonical Autoconf-style shell variable names. For instance
EXTRA_CFLAGS vs. CFLAGS.
Revision Changes Path
1.318 +1 -0 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- STATUS 1998/04/21 14:04:29 1.317
+++ STATUS 1998/04/21 15:23:20 1.318
@@ -58,6 +58,7 @@
* PRs 2081 and 2082 closed
* Ralf's adjustments to `configure --compat' to be even more "compatible"
* Ralf/Jim's enhanced "make install" carefulness for DocRoot, PR#2084
+ * Ralf's back-compat in configure for EXTRA_xxx parameter names
Available Patches:
1.16 +7 -0 apache-1.3/INSTALL
Index: INSTALL
===================================================================
RCS file: /export/home/cvs/apache-1.3/INSTALL,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- INSTALL 1998/04/21 13:52:03 1.15
+++ INSTALL 1998/04/21 15:23:20 1.16
@@ -165,6 +165,13 @@
system or use ``setenv KEY VALUE; ./configure ...'' if you use
one of the C-shell variants (csh, tcsh).
+ Note: The above parameter names are the canonical ones used in
+ Autoconf-style interfaces. But because src/Configuration.tmpl
+ uses the prefix EXTRA_ for some variables (e.g. EXTRA_CFLAGS)
+ these variants are accepted for backward-compatibility
reasons,
+ too. But please use the canonical Autoconf-style names and
+ don't rely on this.
+
Use the --prefix=PREFIX and --exec-prefix=EPREFIX options to configure
Apache to use a particular installation prefix. The default is
PREFIX=/usr/local/apache and EPREFIX=PREFIX.
1.14 +13 -0 apache-1.3/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure 1998/04/21 13:34:41 1.13
+++ configure 1998/04/21 15:23:20 1.14
@@ -203,6 +203,19 @@
fi
done
+# backward compatibility from old src/Configuration.tmpl
+# parameter names to the canonical Autoconf-style shell
+# variable names.
+IFS='
+'
+for var in CFLAGS LDFLAGS LIBS INCLUDES; do
+ eval "val=\$EXTRA_$var"
+ if [ ".$val" != . ]; then
+ eval "$var=\$val"
+ echo " + Hint: please use $var instead of EXTRA_$var next time"
+ fi
+done
+
##
## parse argument line options
##
1.783 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.782
retrieving revision 1.783
diff -u -r1.782 -r1.783
--- CHANGES 1998/04/21 14:04:32 1.782
+++ CHANGES 1998/04/21 15:23:33 1.783
@@ -1,4 +1,9 @@
Changes with Apache 1.3b7
+
+ *) Provide backward compatibility from some old src/Configuration.tmpl
+ parameter names to the canonical Autoconf-style shell variable names.
For
+ instance CFLAGS vs. EXTRA_CFLAGS. The EXTRA_xxx variants are accepted
now
+ but a hint message is displayed. [Ralf S. Engelschall]
*) Make sure that "make install" doesn't overwrite the DocumentRoot and
CGI scripts from an existing Apache installation.
