merge upstream

1 files changed, 50 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c6531ffba3f..9b8e5f762f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,55 @@
+2011-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use gnulib's alloca-opt module.
+        * .bzrignore: Add lib/alloca.h.
+        * Makefile.in (GNULIB_MODULES): Add alloca-opt.
+        * configure.in (AC_FUNC_ALLOCA): Remove almost all the alloca stuff,
+        as gnulib now does that for us.  Put alloca check in config.h.
+        Include <alloca.h> before any other include file, for AIX 3.
+        * lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
+        * lib/alloca.in.h, m4/alloca.m4: New files, from gnulib.
+
+2011-06-21  Leo Liu  <sdl.web@gmail.com>
+
+        * m4/sha256.m4:
+        * m4/sha512.m4:
+        * m4/gl-comp.m4:
+        * lib/u64.h:
+        * lib/sha256.c:
+        * lib/sha256.h:
+        * lib/sha512.c:
+        * lib/sha512.h:
+        * lib/makefile.w32-in (GNULIBOBJS):
+        * lib/gnulib.mk:
+        * Makefile.in (GNULIB_MODULES): Add crypto/sha256 and
+        crypto/sha512 modules from gnulib.
+
+2011-06-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/unistd.in.h, m4/getloadavg.m4: Merge from gnulib.
+
+2011-06-17  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in: Restore the behavior of checking crt-dir only
+        when the user specified it (not all platforms use it).
+
+2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * m4/lstat.m4: Merge from gnulib (Bug#8878).
+
+2011-06-16  Miles Bader <miles@gnu.org>
+
+        * configure.in: Try to determine CRT_DIR automatically when
+        using gcc.
+
 2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>
 
-        * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib.
+        * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h:
+        * lib/gnulib.mk, m4/c-strtod.m4, m4/filemode.m4, m4/getloadavg.m4:
+        * m4/getopt.m4, m4/gl-comp.m4, m4/lstat.m4, m4/md5.m4, m4/mktime.m4:
+        * m4/readlink.m4, m4/sha1.m4, m4/stat.m4, m4/strftime.m4:
+        * m4/strtoull.m4, m4/strtoumax.m4, m4/symlink.m4, m4/time_r.m4:
+        Merge from gnulib.
 
 2011-06-14  Jan Djärv  <jan.h.d@swipnet.se>