1 files changed, 99 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 61a3131d02c..27395616072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,102 @@
+2013-08-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-08-15 warnings: minor optimization
+        2013-08-15 warnings: check -Wfoo rather than -Wno-foo
+
+2013-08-15  Ken Brown  <kbrown@cornell.edu>
+
+        * configure.ac (G_SLICE_ALWAYS_MALLOC): Update comment.
+
+2013-08-15  Glenn Morris  <rgm@gnu.org>
+
+        * make-dist: Do not distribute etc/refcards TeX intermediate files.
+        * Makefile.in (install-arch-indep):
+        Do not install etc/refcards TeX intermediate files.
+
+2013-08-14  Ulrich Müller  <ulm@gentoo.org>
+
+        * configure.ac (EMACS_CONFIGURATION): Escape backslashes.  (Bug#15091)
+
+2013-08-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * configure.ac (HAVE_ZLIB): Don't use -lz on MinGW.
+
+2013-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Minor zlib configuration tweaks.
+        * configure.ac (HAVE_ZLIB): Don't assume zlib is linked if PNG is.
+
+2013-08-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * configure.ac (LIBZ): Comment on w32 peculiarities regarding LIBZ.
+
+2013-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
+        2013-08-10 sys_time: port to OpenBSD
+
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac (etcdocdir): Rename from docdir, to avoid confusion
+        with configure's standard --docdir argument.  All uses updated.
+        * Makefile.in (etcdocdir): Rename from docdir.  All uses updated.
+        (install-etcdoc): Rename from install-doc.  All uses updated.
+        (uninstall): Run uninstall-doc.
+        (PSS): Add misc-ps.
+        (INSTALL_DVI, INSTALL_HTML, INSTALL_PDF, INSTALL_PS)
+        (INSTALL_DOC, UNINSTALL_DVI, UNINSTALL_HTML, UNINSTALL_PDF)
+        (UNINSTALL_PS, UNINSTALL_DOC): New variables.
+        ($(INSTALL_DOC), install-doc, install-dvi, install-html, install-pdf)
+        (install-ps, $(UNINSTALL_DOC), uninstall-doc, uninstall-dvi)
+        (uninstall-html, uninstall-pdf, uninstall-ps): New .PHONY rules.
+
+2013-08-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Add --with-zlib to 'configure'.
+        * configure.ac: Add --with-zlib option to 'configure', so that Emacs
+        can be built without zlib.  Don't assume that -lz is needed on
+        non-PNG hosts.  Mention zlib configuration status in 'configure' output.
+
+2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * configure.ac: Test for zlib.
+
+2013-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * configure.ac: Define and substitute UPDATE_MANIFEST.
+
+2013-08-04  Stephen Berman  <stephen.berman@gmx.net>
+
+        * info/dir: Add todo-mode.
+
+2013-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix some minor races in hosts lacking mkostemp (Bug#15015).
+        Gnulib's emulation of mkostemp doesn't have races that Emacs's does.
+        * configure.ac (mkostemp): Remove check for this function;
+        gnulib does the check now.
+        (mkstemp): Remove check for this no-longer-used function.
+        * lib/mkostemp.c, lib/secure_getenv.c, lib/tempname.c, lib/tempname.h:
+        * m4/mkostemp.m4, m4/secure_getenv.m4, m4/tempname.m4:
+        New files, copied from Gnulib.
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
+2013-07-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * INSTALL (DETAILED BUILDING AND INSTALLATION): Add
+        --without-file-notification to --without-all.
+
+2013-07-29  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * INSTALL: Fix description.
+
+2013-07-27  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac: Extend the --with-sound option to allow
+        specification of OSS or ALSA (see bug#14812#64).
+
 2013-07-25  Glenn Morris  <rgm@gnu.org>
 
         * info/dir: Add ido.