X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2FChangeLog;h=67311a508ddcac5ac869364be240f935efe55fd1;hb=1d9a0a33ef60f6b760d76637b658b3d38e5b5810;hp=def865bb018a8359ba7058c9b81fd82d7ce51b4b;hpb=5db79a17db99183fb7800691226b8c913280448f;p=gnulib.git

diff --git a/m4/ChangeLog b/m4/ChangeLog
index def865bb0..67311a508 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -13,7 +13,22 @@
 
 2004-03-30  Paul Eggert  <eggert@twinsun.com>
 
+	Merge from coreutils.
+	
 	* inttostr.m4: New file.
+	* getdate.m4 (gl_GETDATE): Remove time-related stuff.
+	Require AM_STDBOOL_H and gl_TIMESPEC instead.
+	Require gl_CLOCK_TIME.
+	* clock_time.m4 (gl_CLOCK_TIME): Require AC_GNU_SOURCE.
+
+2004-03-30  Jim Meyering  <jim@meyering.net>
+
+	Merge from coreutils.
+
+	Avoid a configure-time warning about sys/ucred.h on OSF V4.0.
+	* ls-mntd-fs.m4: Test for sys/ucred.h separately, since
+	on some systems one must include <grp.h> before it.
+	Reported by Christian Krackowizer.
 
 2004-03-29  Paul Eggert  <eggert@twinsun.com>