1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index bdccef5941c..52aa133f8e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-10-07  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Merge from gnulib, fixing some 'configure' typos (Bug#9696).
+        * lib/signal.in.h, lib/sigprocmask.c, m4/gl-comp.m4:
+        * m4/gnulib-common.m4: Merge from gnulib.
+        Without this, 'configure' would say "func_gl_gnulib_m4code_pathmax:
+        command not found" on powerpc-apple-darwin9.8.0.
+
         * configure.in (GC_LISP_OBJECT_ALIGNMENT): Remove.
         This is now done by src/alloc.c.