From 48512bcf24e8c7faadcaf2de0c5804882b88e1ac Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Fri, 16 Jan 2004 09:03:37 +0000
Subject: *** empty log message ***

---
 m4/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'm4/ChangeLog')

diff --git a/m4/ChangeLog b/m4/ChangeLog
index c9d54440a..f52f12c69 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -4,6 +4,14 @@
 
 	* getpass.m4 (gl_PREREQ_GETPASS): Check for stdio_ext.h.
 
+2003-08-26  Bruno Haible  <bruno@clisp.org>
+
+	Merge from gnulib.
+
+	* fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Remove AC_DEFINE of fnmatch here.
+	This avoids havoc on compilers for which '#define fnmatch rpl_fnmatch'
+	followed by '#define fnmatch fnmatch_posix' gives an error.
+
 2004-01-14  Paul Eggert  <eggert@twinsun.com>
 
 	* posixv.m4 (gl_POSIXVER): Require gl_DEFAULT_POSIX2_VERSION.
-- 
cgit v1.2.3-54-g00ecf