1 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6aaebbc80e9..845fce543b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,15 +2,17 @@
 
         Add gnulib support for pthread_sigmask (Bug#9010).
         * Makefile.in (GNULIB_MODULES): Add pthread_sigmask.
-        (GNULIB_TOOL_FLAGS): Avoid sigprocmask.  Emacs does its own
-        implementation of 'sigprocmask' on Windows, and it assumes
-        'sigprocmask' on non-Windows hosts, so it doesn't need the
-        sigprocmask module.
+        * configure.in (AC_TYPE_UID_T): New dummy macro.
+        Configure gnulib after adjusting LIBS,
+        so that gnulib can assume the libraries in LIBS.
         * lib/signal.in.h, m4/pthread_sigmask.m4, m4/signal_h.m4:
+        * lib/pthread_sigprocmask.c, lib/sigprocmask.c, m4/signalblocking.m4:
         New files, automatically imported from gnulib.
         * lib/gnulib.mk, m4/gl-comp.m4: Automatically-imported update
         due to the above changes.
         * .bzrignore: Add lib/signal.h.
+        * src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro.
+        (LIBES): Use it.
 
 2011-07-07  Andreas Schwab  <schwab@linux-m68k.org>