summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/mkmakemod.sh5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a67a9a4e..60beb583e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-26  Clint Adams  <clint@zsh.org>
 
+	* 22466: Src/mkmakemod.sh: cope with autoconf 2.60 config.status
+	syntax.
+
 	* 22465: Config/defs.mk.in: add datarootdir for substitution
 	in order to cope with change in autoconf CVS.
 
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index e67b7a7a8..da01c953b 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -111,9 +111,10 @@ if $first_stage; then
     sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`"
     module_list="${bin_mods}${dyn_mods}"
 
-    # check both 2.13 and 2.50 syntax
+    # check 2.13, 2.50, and 2.60 syntaxes
     if grep '%@D@%D%' config.status >/dev/null ||
-       grep ',@D@,D,' config.status >/dev/null; then
+       grep ',@D@,D,' config.status >/dev/null ||
+       grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then
 	is_dynamic=true
     else
 	is_dynamic=false