I've just made the latest CVS versions of automake and autoconf work
together to generate configure et. al.  for the fileutils.  Here's one
of the changes I had to make: (I'm still trying to find a good fix for
a depcomp-related problem)

        * m4/header.m4 (AM_CONFIG_HEADER): Fix typo in last change:
        add missing closing bracket and closing parenthesis.
        Don't quote the first argument to AC_OUTPUT_COMMANDS.
        Backslash-escape the backquotes and `$' in `am_indx'-incrementing stmt.

I'll do some more testing, then (barring any problems)
check this in tomorrow.

Index: m4/header.m4
===================================================================
RCS file: /cvs/automake/automake/m4/header.m4,v
retrieving revision 1.6
diff -u -p -r1.6 header.m4
--- header.m4   2000/08/02 08:59:16     1.6
+++ header.m4   2000/08/05 13:23:19
@@ -1,6 +1,6 @@
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-# serial 2
+# serial 3
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
@@ -11,17 +11,18 @@ AC_PREREQ([2.12])
 
 AC_DEFUN([AM_CONFIG_HEADER],
 [AC_CONFIG_HEADER([$1])
-AC_OUTPUT_COMMANDS(
-[ifelse(patsubst([$1], [[^ ]], []),
-        [],
-        [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
-         patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h])],
-[am_indx=1
-for am_file in $1; do
-  case " $CONFIG_HEADERS " in
-  *" $am_file "*)
-    echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "$am_indx" + 1`
-done])
+  AC_OUTPUT_COMMANDS(
+   ifelse(patsubst([$1], [[^ ]], []),
+         [],
+         [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+          patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
+  [am_indx=1
+  for am_file in $1; do
+    case " $CONFIG_HEADERS " in
+    *" $am_file "*)
+      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
+      ;;
+    esac
+    am_indx=\`expr \$am_indx + 1\`
+  done])
+])

Reply via email to