mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-23 17:01:05 +02:00
Code Releases Activity

Fix a few problems with config.modules stuff

Browse source
This commit is contained in:
Peter Stephenson 2000-11-27 11:26:14 +00:00
parent 5b44123d5d
commit 1851f87325
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2000-11-27 Peter Stephenson <pws@csr.com>
* 13197: configure.in: fix problems with use of link parameter,
directories for reading old config.modules file, and inconsistent
values for auto parameter.
* 13196: Etc/zsh-development-guide: Use of `either' keyword for
`link' module parameter.
2000-11-26 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> 2000-11-26 Peter Stephenson <pws@pwstephenson.fsnet.co.uk>
* 13194: INSTALL, configure.in, Config/defs.mk.in, * 13194: INSTALL, configure.in, Config/defs.mk.in,

24
configure.in
View file

@ -1710,13 +1710,15 @@ CONFIG_MODULES=./config.modules
echo "creating ${CONFIG_MODULES}" echo "creating ${CONFIG_MODULES}"
userlist=" " userlist=" "
if test -f config.modules; then if test -f config.modules; then
userlist=`sed -e '/^#/d' -e '/auto=y/d' -e 's/ .*/ /' -e 's/^name=/ /' \ userlist="`sed -e '/^#/d' -e '/auto=y/d' -e 's/ .*/ /' -e 's/^name=/ /' \
${CONFIG_MODULES}` ${CONFIG_MODULES}`"
mv ${CONFIG_MODULES} ${CONFIG_MODULES}.old mv ${CONFIG_MODULES} ${CONFIG_MODULES}.old
fi 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 "# 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 "#"
echo "# Values of \`link' are \`static', \`dynamic' or \`no' to compile the" 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." echo "# module into the shell, link it in at run time, or not use it at all."
@ -1736,17 +1738,17 @@ echo "# module."
echo "#" echo "#"
echo "# You should not change the values for the pseudo-module zsh/main," echo "# You should not change the values for the pseudo-module zsh/main,"
echo "# which is the main shell." echo "# which is the main shell."
for modfile in */*.mdd */*/*.mdd; do for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do
name= name=
link= link=
load= load=
. $modfile . ${srcdir}/$modfile
if test x$name != x -a x$link != x; then if test x$name != x -a x"$link" != x; then
case $userlist in case "$userlist" in
*" $name "*) # not autogenerated, keep original *" $name "*) # not autogenerated, keep original
grep "^name=$name " ${CONFIG_MODULES}.old grep "^name=$name " ${CONFIG_MODULES}.old
;; ;;
*) case $link in *) case "$link" in
*\ *) eval 'link=`'$link'`' *\ *) eval 'link=`'$link'`'
;; ;;
esac esac
@ -1756,7 +1758,7 @@ for modfile in */*.mdd */*/*.mdd; do
*) load=" load=no" *) load=" load=no"
;; ;;
esac esac
case $link in case "$link" in
static) echo "name=$name modfile=$modfile link=static auto=yes${load}" static) echo "name=$name modfile=$modfile link=static auto=yes${load}"
;; ;;
dynamic) if test $dynamic != no; then dynamic) if test $dynamic != no; then
@ -1764,7 +1766,7 @@ for modfile in */*.mdd */*/*.mdd; do
auto=yes${load}" auto=yes${load}"
else else
echo "name=$name modfile=$modfile link=no\ echo "name=$name modfile=$modfile link=no\
auto=no load=no" auto=yes load=no"
fi fi
;; ;;
either) if test $dynamic != no; then either) if test $dynamic != no; then