# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1061027013 0
# Node ID 08358b56eaa77de97c345b6b4943f5f96009301f
# Parent  0b7ce5a214569cc18bd9d30fb7b92262fd6229a9
More merges from coreutils, etc.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2003-08-15  Paul Eggert  <eggert@twinsun.com>
+
+	* modules/userspec: Depend on posixver.
+	* modules/strftime: Depend on tzset.
+
+2003-08-14  Jim Meyering  <jim@meyering.net>
+
+	Merges from coreutils.
+	* modules/fnmatch: Use the `$(FNMATCH_H)' notation for AC_REPLACED
+	variable names, rather than @FNMATCH_H@.
+	* modules/alloca: Likewise for $(ALLOCA_H).
+
+	* modules/fnmatch (fnmatch.h): Use `$@' in the commands, in place of
+	the three copies of the literal target, `fnmatch.h'.
+	* modules/alloca (alloca.h): Likewise.
+
 2003-08-14  Paul Eggert  <eggert@twinsun.com>
 
 	* modules/tzset: New file.