24498: tweak to grep config.h instead of config.status for dynamic co…

…nfig
richo · Jan 30, 2008 · 4c5d9ae · 4c5d9ae
1 parent 9d2248d
commit 4c5d9ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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