rse 98/04/21 09:00:38
Modified: . STATUS INSTALL configure
src CHANGES
Log:
Avoid side-effects in src/Configure when the user exports the shell
variables via
$ CFLAGS=...
$ export CFLAGS
$ ./configure
(which is not needed) instead of
$ CFLAGS=.. ./configure
PR: 2101
Revision Changes Path
1.319 +1 -0 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- STATUS 1998/04/21 15:23:20 1.318
+++ STATUS 1998/04/21 16:00:32 1.319
@@ -59,6 +59,7 @@
* 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
+ * Ralf's configure fix to avoid side-effects in Configure on exported
vars
Available Patches:
1.17 +7 -7 apache-1.3/INSTALL
Index: INSTALL
===================================================================
RCS file: /export/home/cvs/apache-1.3/INSTALL,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- INSTALL 1998/04/21 15:23:20 1.16
+++ INSTALL 1998/04/21 16:00:32 1.17
@@ -157,13 +157,13 @@
override the corresponding default entries in the src/Configuration.tmpl
file (see there for more information about their usage).
- Note: The syntax ``KEY=VALUE ./configure ...'' is the GNU Autoconf
- compatible way of specifying defines and can be used with
- Bourne shell compatible shells only (sh, bash, ksh). If you
use
- a different type of shell either use ``env KEY=VALUE
- ./configure ...'' when the `env' command is available on your
- system or use ``setenv KEY VALUE; ./configure ...'' if you use
- one of the C-shell variants (csh, tcsh).
+ Note: The syntax ``KEY=VALUE ./configure ...'' (one single line!) is
+ the GNU Autoconf compatible way of specifying defines and can
+ be used with Bourne shell compatible shells only (sh, bash,
+ ksh). If you use a different type of shell either use ``env
+ KEY=VALUE ./configure ...'' when the `env' command is
available
+ on your 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
1.15 +10 -4 apache-1.3/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- configure 1998/04/21 15:23:20 1.14
+++ configure 1998/04/21 16:00:33 1.15
@@ -212,6 +212,7 @@
eval "val=\$EXTRA_$var"
if [ ".$val" != . ]; then
eval "$var=\$val"
+ eval "EXTRA_$var=\"\"; export EXTRA_$var"
echo " + Hint: please use $var instead of EXTRA_$var next time"
fi
done
@@ -765,16 +766,21 @@
touch sedsubst
# generate settings from imported environment variables
-IFS=' '
+IFS='
+'
for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LDFLAGS_SHLIB \
LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do
eval "val=\$$var";
if [ ".$val" != . ]; then
case $var in
- CFLAGS|LDFLAGS|LIBS|INCLUDES) var="EXTRA_$var" ;;
+ CFLAGS|LDFLAGS|LIBS|INCLUDES)
+ echo "s%^#*\\(EXTRA_$var=\\).*%\\1$val%g" >>sedsubst
+ ;;
+ *)
+ echo "s%^#*\\($var=\\).*%\\1$val%g" >>sedsubst
+ ;;
esac
- echo "s%^#*\\($var=\\).*%\\1$val%g" >>sedsubst
- eval "$var="
+ eval "$var=\"\"; export $var"
fi
done
1.784 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- CHANGES 1998/04/21 15:23:33 1.783
+++ CHANGES 1998/04/21 16:00:34 1.784
@@ -1,5 +1,10 @@
Changes with Apache 1.3b7
+ *) Let "configure" clear out the users parameters (provided as shell
+ variables) to avoid side-effects in "src/Configure" when the user
+ exported them (which is not needed, but some users do it).
+ [Ralf S. Engelschall, PR#2101]
+
*) 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
