Merge from trunk.

1 files changed, 22 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a41994d27a..a21cf9dde20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib, using build-aux to remove clutter (Bug#9169).
 	* m4/largefile.m4: New file, so that Emacs does not mess up when
@@ -30,6 +30,27 @@
 	'configure'.
 	* make-dist: Adjust to new build-aux and build-aux/snippit dirs.
 
+2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Assume freestanding C89 headers, string.h, stdlib.h.
+	Again, this simplifies the code, and all current platforms have these.
+	* configure.in (AC_CHECK_HEADERS): Don't check for limits.h.
+	(AC_HEADER_STDC): Remove.
+	(AC_CHECK_FUNCS): No need to check for strchr, strrchr.
+	(strchr, strrchr): Remove fallback macros.
+
+	Assume support for memcmp, memcpy, memmove, memset.
+	This simplifies the code a bit.  All current platforms have these,
+	as they are required for C89.  If this turns into a problem we
+	can add the gnulib modules for these (a 1-line change to Makefile.in).
+	* configure.in: Don't check for memcmp, memcpy, memmove, memset.
+
+2011-07-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* GNUmakefile: New file.
+	This is for convenience, so that one can run GNU make in an
+	unconfigured source tree, and get a default build.
+
 2011-07-13  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* configure.in (GSETTINGS): Check for gio-2.0 >= 2.26.