Merge from trunk.

1 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 09d1f9873dc..616c345d7d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-11  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.
@@ -15,6 +15,17 @@
 
 2011-07-09  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * lib/stdint.in.h: Merge from gnulib (Bug#9025).
+        This fixes a build problem on older Mac OS X hosts.
+
+        * m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Omit gl_THREADLIB
+        test, which runs afoul of Automake installations where, for example,
+        /usr/share/aclocal contains a copy of gl_THREADLIB.
+        Problem reported by Sven Joachim in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00529.html>.
+        This is just a quick temporary fix, specific to Emacs; I'll work
+        with the other gnulib maintainers to get a more-permanent fix.
+
         Add gnulib's strtoimax module, needed on Solaris 8.
         * Makefile.in (GNULIB_MODULES): Add strtoimax.
         * lib/strtoll.c, m4/strtoimax.m4, m4/strtoll.m4: New files,