summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-01-30 10:03:49 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-01-30 10:03:49 +0000
commit4c5d9ae3d5807bab091c7fe54e3c1d445c7ca172 (patch)
tree0c267ad3b27013298d98a84572b83ff32720fd0a
parent9d2248d3847def49d7d8006b7fd3affb24aeb6c5 (diff)
downloadzsh-4c5d9ae3d5807bab091c7fe54e3c1d445c7ca172.tar.gz
zsh-4c5d9ae3d5807bab091c7fe54e3c1d445c7ca172.zip
24498: tweak to grep config.h instead of config.status for dynamic config
-rw-r--r--ChangeLog4
-rw-r--r--Src/mkmakemod.sh5
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c2f8cf9..42d494069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-30 Peter Stephenson <pws@csr.com>
+ * 24498: Src/mkmakemod.sh: check config.h instead of config.status
+ for dynamic configuration since the syntax is less variable.
+ Could be done by generating from Src/mkmakemod.sh.in instead.
+
* 24496: Doc/Zsh/contrib.yo: more Yodl parenthesis protection.
2008-01-29 Peter Stephenson <pws@csr.com>
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index d275038d9..2e0963f8e 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -111,10 +111,7 @@ if $first_stage; then
sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`"
module_list="${bin_mods}${dyn_mods}"
- # check 2.13, 2.50, and 2.60 syntaxes
- if grep '%@D@%D%' config.status >/dev/null ||
- grep ',@D@,D,' config.status >/dev/null ||
- grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then
+ if grep '^#define DYNAMIC ' config.h >/dev/null; then
is_dynamic=true
else
is_dynamic=false