Use full name for m4/gnulib-comp.m4. (Bug#11529)

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index deb83a9..5ee3112 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,19 @@
+2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use full name for m4/gnulib-comp.m4.  (Bug#11529)
+       * merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
+
+       Assume C89 or later.
+       * CPP-DEFINES: Remove NULL, const.
+
+       Make merging from gnulib a script, not a makefile action.
+       * merge-gnulib: New script, with actions moved here from
+       ../Makefile.in.
+
 2012-05-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove.
+
        * CPP-DEFINES (HAVE_FTIME): Remove.
 
 2012-05-02  Glenn Morris  <rgm@gnu.org>