# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 960021184 0
# Node ID 686c26afcebf62be7eb2705f642a0db812a83de8
# Parent  0ec2f09e5139a67330b02d5add1746fb4e3e5e3c
*** empty log message ***

diff --git a/lib/ChangeLog b/lib/ChangeLog
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-26  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.am (install-exec-local): On systems with glibc-2.1 or
+	newer, don't install charset.alias.
+	* config.charset: Change the Linux/glibc rules so they become empty
+	on glibc-2.1 or newer.
+
 2000-06-02  Jim Meyering  <meyering@lucent.com>
 
 	* mountlist.c: Back out last change.  Instead, do this...
diff --git a/m4/ChangeLog b/m4/ChangeLog
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,7 +1,7 @@
-2000-06-03  Jim Meyering  <meyering@lucent.com>
+2000-05-26  Bruno Haible  <haible@clisp.cons.org>
 
-	* glibc21.m4 (jm_GLIBC21): New macro/file.  From Bruno Haible.
-	* jm-macros.m4 (jm_MACROS): Use jm_GLIBC21.
+	* glibc21.m4: New file.
+	* jm-macros.m4: (jm_MACROS): Call jm_GLIBC21.
 
 2000-05-28  Jim Meyering  <meyering@lucent.com>