about summary refs log tree commit diff
diff options
context:
space:
mode:
-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