about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2003-03-15 17:36:15 +0000
committerBart Schaefer <barts@users.sourceforge.net>2003-03-15 17:36:15 +0000
commit6a712844959230ea633edc77336f984f75aeec68 (patch)
treec051b0c2a67ac4f3d7bc3c455477ea8ac28258e6
parent454c01accf4c7c9ff426848671be2e6b4296db36 (diff)
downloadzsh-6a712844959230ea633edc77336f984f75aeec68.tar.gz
zsh-6a712844959230ea633edc77336f984f75aeec68.tar.xz
zsh-6a712844959230ea633edc77336f984f75aeec68.zip
17659,17661: config.status processes config.modules
-rw-r--r--ChangeLog6
-rw-r--r--zshconfig.ac13
2 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 639c43269..6cb4a8873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-15  Bart Schaefer  <schaefer@zsh.org>
+
+	* 17659, 17661: zshconfig.ac: insert config.modules processing
+	into config.status, so that a full configure is not necessary
+	when changing the module configuration.
+
 2003-03-15  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
 
 	* unposted: Completion/X/Command/_xrdb: remove _xrdb as superior
diff --git a/zshconfig.ac b/zshconfig.ac
index fd578c028..5d561fb33 100644
--- a/zshconfig.ac
+++ b/zshconfig.ac
@@ -1909,9 +1909,15 @@ AC_SUBST(EXTRAZSHOBJS)dnl
 # level subdirectories.  Any existing line not containing 'auto=y' will be
 # retained, provided the .mdd file itself was found.
 CONFIG_MODULES=./config.modules
+cat <<EOM > ${CONFIG_MODULES}.sh
+srcdir="$srcdir"
+dynamic="$dynamic"
+CONFIG_MODULES="${CONFIG_MODULES}"
+EOM
+cat <<\EOM >> ${CONFIG_MODULES}.sh
 echo "creating ${CONFIG_MODULES}"
 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=/ /' \
         ${CONFIG_MODULES}`"
   mv ${CONFIG_MODULES} ${CONFIG_MODULES}.old
@@ -1997,6 +2003,11 @@ for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do
   fi
 done) >${CONFIG_MODULES}
 rm -f ${CONFIG_MODULES}.old
+EOM
+AC_OUTPUT_COMMANDS(,[if test -z "\$CONFIG_FILES\$CONFIG_HEADERS"; then
+`cat ./${CONFIG_MODULES}.sh && rm -f ./${CONFIG_MODULES}.sh`
+fi])
+. ./${CONFIG_MODULES}.sh
 
 CLEAN_MK="${srcdir}/Config/clean.mk"
 CONFIG_MK="${srcdir}/Config/config.mk"