merge from trunk

1 files changed, 28 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 2384178e82c..1feddc0a8e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+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.