Merge from trunk.

1 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b9a7176b05..2cd3f8eef85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-10-25  Nali Toja  <nalitoja@gmail.com>  (tiny change)
+
+        * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var.  (Bug#9868)
+
+2011-10-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852)
+        if the library is found.  Otherwise, later configure-time tests,
+        such as the test for pthread_sigmask, generate the wrong results
+        on some platforms.  Problem reported for FreeBSD by Nali Toja.
+
 2011-10-20  Paul Eggert  <eggert@cs.ucla.edu>
 
         Time zone name fixes for non-ASCII locales (Bug#641, Bug#9794)