rse 99/08/29 03:43:13
Modified: src CHANGES
. configure
Log:
Even more convinience features for config.option:
allow the loading of multiple option sections at once via
``--with-option=<section1>,<section2>,...''. This way
one can reasonably combine the contents of disjunctive sections like
in ``--with-option=devel,mpm-dexter-pth''.
Revision Changes Path
1.5 +3 -1 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CHANGES 1999/08/28 00:36:40 1.4
+++ CHANGES 1999/08/29 10:43:12 1.5
@@ -4,7 +4,9 @@
for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
PR#2584, PR#2751, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
- *) Support line-continuation feature in config.option file.
+ *) Support line-continuation feature in config.option file and
+ allow the loading of multiple option sections at once via
+ ``--with-option=<section1>,<section2>,...''
[Ralf S. Engelschall]
*) Rebuilt CVS repository with Apache 1.3.9 as basis. [Roy Fielding]
1.4 +17 -16 apache-2.0/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-2.0/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure 1999/08/27 14:37:13 1.3
+++ configure 1999/08/29 10:43:13 1.4
@@ -493,39 +493,40 @@
case $apc_optarg in
*:* )
file=`echo $apc_optarg | sed -e 's/:.*//'`
- name=`echo $apc_optarg | sed -e 's/.*://'`
+ names=`echo $apc_optarg | sed -e 's/.*://'`
;;
* )
- name=$apc_optarg
file=$configoption
+ names="$apc_optarg"
;;
esac
if [ ! -f "$file" ]; then
echo "configure:Error: Option definition file $file not
found" 1>&2
exit 1
fi
+ OOIFS="$IFS"
+ IFS=","
echo "loadopt=''" >$pldconf
- sed -e "1,/[ ]*<[Oo]ption[ ]*common[ ]*>[ ]*/d" \
- -e '/[ ]*<\/[Oo]ption>[ ]*/,$d' \
- -e ':join' -e '/\\[ ]*$/N' -e 's/\\[ ]*\n[ ]*//'
-e 'tjoin' \
- -e 's/^[ ]*//g' \
- -e 's/^\(--.*=.*\)$/loadopt="$loadopt \1"/' \
- $file >>$pldconf
- sed -e "1,/[ ]*<[Oo]ption[ ]*$name[ ]*>[ ]*/d" \
- -e '/[ ]*<\/[Oo]ption>[ ]*/,$d' \
- -e ':join' -e '/\\[ ]*$/N' -e 's/\\[ ]*\n[ ]*//'
-e 'tjoin' \
- -e 's/^[ ]*//g' \
- -e 's/^\(--.*=.*\)$/loadopt="$loadopt \1"/' \
- $file >>$pldconf
+ loaded=""
+ for name in common $names; do
+ loaded="$loaded $name"
+ sed -e "1,/[ ]*<[Oo]ption[ ]*${name}[ ]*>[
]*/d" \
+ -e '/[ ]*<\/[Oo]ption>[ ]*/,$d' \
+ -e ':join' -e '/\\[ ]*$/N' -e 's/\\[ ]*\n[
]*//' -e 'tjoin' \
+ -e 's/^[ ]*//g' \
+ -e 's/^\(--.*=.*\)$/loadopt="$loadopt \1"/' \
+ $file >>$pldconf
+ done
+ IFS="$OOIFS"
. $pldconf
+ rm -f $pldconf 2>/dev/null
if [ "x$*" = "x" ]; then
set -- $loadopt
else
set -- "$@" $loadopt
fi
- rm -f $pldconf 2>/dev/null
if [ "x$quiet" = "xno" ]; then
- echo " + loaded configuration options: $name ($file)"
+ echo " + loaded configuration options:$loaded ($file)"
fi
;;
*)
