Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: PATCH: Module configuration changes
- X-seq: zsh-workers 13197
- From: Peter Stephenson <pws@xxxxxxx>
- To: zsh-workers@xxxxxxxxxxxxxx (Zsh hackers list)
- Subject: Re: PATCH: Module configuration changes
- Date: Mon, 27 Nov 2000 11:20:43 +0000
- In-reply-to: "Your message of Sun, 26 Nov 2000 19:55:03 GMT." <E1407sP-00066Q-00.2000-11-26-19-54-18@xxxxxxxxxxxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm
> Here is the first stage in an improvement in the way modules are
> configured.
Tweaks based on configuring here on Solaris (dynamic) and cygwin (static)
with separate source and build directories, some auto=no modules, and one
cygwin-only module. Otherwise things look OK.
Index: configure.in
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.in,v
retrieving revision 1.33
diff -u -r1.33 configure.in
--- configure.in 2000/11/26 20:01:01 1.33
+++ configure.in 2000/11/27 11:17:18
@@ -1710,13 +1710,15 @@
echo "creating ${CONFIG_MODULES}"
userlist=" "
if test -f config.modules; then
- userlist=`sed -e '/^#/d' -e '/auto=y/d' -e 's/ .*/ /' -e 's/^name=/ /' \
- ${CONFIG_MODULES}`
+ userlist="`sed -e '/^#/d' -e '/auto=y/d' -e 's/ .*/ /' -e 's/^name=/ /' \
+ ${CONFIG_MODULES}`"
mv ${CONFIG_MODULES} ${CONFIG_MODULES}.old
fi
-(cd ${srcdir}
-echo "# Edit this file to change the way modules are loaded."
+(echo "# Edit this file to change the way modules are loaded."
echo "# The format is strict; do not break lines or add extra spaces."
+echo "# Run \`make prep' if you change anything here after compiling"
+echo "# (there is no need if you change this just after the first time"
+echo "# you run \`configure')."
echo "#"
echo "# Values of \`link' are \`static', \`dynamic' or \`no' to compile the"
echo "# module into the shell, link it in at run time, or not use it at all."
@@ -1736,17 +1738,17 @@
echo "#"
echo "# You should not change the values for the pseudo-module zsh/main,"
echo "# which is the main shell."
-for modfile in */*.mdd */*/*.mdd; do
+for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do
name=
link=
load=
- . $modfile
- if test x$name != x -a x$link != x; then
- case $userlist in
+ . ${srcdir}/$modfile
+ if test x$name != x -a x"$link" != x; then
+ case "$userlist" in
*" $name "*) # not autogenerated, keep original
grep "^name=$name " ${CONFIG_MODULES}.old
;;
- *) case $link in
+ *) case "$link" in
*\ *) eval 'link=`'$link'`'
;;
esac
@@ -1756,7 +1758,7 @@
*) load=" load=no"
;;
esac
- case $link in
+ case "$link" in
static) echo "name=$name modfile=$modfile link=static auto=yes${load}"
;;
dynamic) if test $dynamic != no; then
@@ -1764,7 +1766,7 @@
auto=yes${load}"
else
echo "name=$name modfile=$modfile link=no\
- auto=no load=no"
+ auto=yes load=no"
fi
;;
either) if test $dynamic != no; then
--
Peter Stephenson <pws@xxxxxxx> Software Engineer
Cambridge Silicon Radio, Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK Tel: +44 (0)1223 392070
Messages sorted by:
Reverse Date,
Date,
Thread,
Author