upstream

1 files changed, 20 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index fe4b74535ae..605ef32b598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-12-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).
+        * configure.in (HAVE_PTHREAD): Check for pthread_atfork if linking
+        to gmalloc.c.  This should prevent a MirBSD 10 build failure reported
+        by Nelson H. F. Beebe in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00065.html>.
+
+2011-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * update-subdirs: Don't set no-byte-compile twice (bug#10260).
+
+2011-12-10  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS
+        instead of LDFLAGS (Bug#10230).
+
 2011-12-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         * INSTALL.BZR: Mention configure -C, --disable-maintainer-mode.
@@ -2245,7 +2262,7 @@
 
 2009-12-10  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * configure.in: Check for RSVG if GNUStep is used.
+        * configure.in: Check for RSVG if GNUstep is used.
 
 2009-12-09  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -2430,7 +2447,7 @@
 
 2009-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * configure.in: Don't define CANNOT_DUMP for GNUStep any more.
+        * configure.in: Don't define CANNOT_DUMP for GNUstep any more.
 
 2009-05-05  Per Starbäck  <per@starback.se>  (tiny change)
 
@@ -8171,7 +8188,7 @@
 1994-01-08  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
 
         * configure.in (creating src/Makefile): Put code inside 2nd arg to
-        AC_OUTPUT as it should be; hopefully noone will again see fit to
+        AC_OUTPUT as it should be; hopefully no one will again see fit to
         gratuitously break this and not make a change log entry.
         Optimized sed processing of Makefile.in and cpp output; now
         preserves comments previously removed from the cpp input.