X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/edfaf76da92ee7722580a29fefc7e30540a5199e..354617b5fa3cbcaa0932310f3c5082e86c28d174:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c44bcfbbf3..d216ab222d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-08-03  Juanma Barranquero  <lekktu@gmail.com>
+
+	* .cvsignore: Add `lock'.
+
+2005-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+	* .cvsignore: Add `data' and `site-lisp' (for in-place installs).
+
+2005-07-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge gnulib getopt implementation into Emacs.
+
+	* Makefile.in (AUTOCONF_INPUTS): New macro.
+	($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
+	so that these files also depend on m4/getopt.m4.
+	* configure.in: Configure getopt by including m4/getopt.m4,
+	and configuring a getopt replacement if necessary.
+	* make-dist: Add m4 subdirectory.  Unlink lib-src/getopt.h.
+	* m4/getopt.m4: New file.
+
 2005-07-06  Lute Kamstra  <lute@gnu.org>
 
 	* configure.in: Fix capitalization.