Merge from gnulib.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 107c28c..6cf2f87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2014-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2014-01-07 update from texinfo
+       2014-01-06 md5, sha1, sha256, sha512: support older autoconf
+
+2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
+
+       * INSTALL, configure.ac, etc/CONTRIBUTE, nt/INSTALL: Remove
+       unnecessarily specific references to Bazaar that could better
+       simply be to the repository.
+
+2014-01-08  Eric S. Raymond  <esr@thyrsus.com>
+
+       * INSTALL.BZR: Renamed to INSTALL.REPO
+       * INSTALL, autogen.sh, etc/AUTHORS, etc/CONTRIBUTE,
+       lisp/emacs-lisp/authors.el, nt/INSTALL: Carry through the
+       above renaming.
+       * INSTALL.REPO: remove all references to any specific VCS.
+
+2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Port to GNU/Linux with recent grsecurity/PaX patches (Bug#16343).
+       Problem and proposed patch reported by Ulrich Mueller;
+       this patch uses a somewhat-different approach.
+       * configure.ac (SETFATTR): New variable.
+
+2014-01-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2014-01-02 manywarnings: remove -Wmudflap
+       This ports better to GCC 4.9-to-be.
+
+2013-12-31  Fabrice Popineau  <fabrice.popineau@supelec.fr>
+
+       * configure.ac (canonical, C_SWITCH_SYSTEM): Support a 64-bit
+       MinGW64 build on MS-Windows.
+
+2013-12-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.ac (xcsdkdir): Only set if using xcrun.
+
+2013-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * configure.ac (LIBXML2_CFLAGS): Fix xcrun-related quoting problem.
+       Reported by YAMAMOTO Mitsuharu in:
+       http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00995.html
+
+2013-12-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.ac: Fix CC detection for xcrun case.
+
+2013-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix problem with MAKE and xcrun configuration.
+       * configure.ac: Don't set MAKE unless 'make' doesn't work.
+       Set it only in the environment, not in the makefile.
+       Problem reported by Glenn Morris in:
+       http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00969.html
+
+2013-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Port xcrun configuration to GNU/Linux.
+       * configure.ac (xcsdkdir): Default to empty.
+       (XCRUN): Don't require Darwin for xcrun.  Move xcrun checking to
+       just before AM_INIT_AUTOMAKE, to make the dependency between it
+       and automake clearer.
+       (CC): Don't use AC_PROG_CC twice; only the first use expands to the
+       shell code that is wanted, which breaks 'configure' on non-Darwin
+       platforms.  Instead, fix CC by hand if it's not found.
+
 2013-12-27  Jan Djärv  <jan.h.d@swipnet.se>
 
        * configure.ac: Detect xcrun on OSX and use it for make, gcc and
@@ -278,7 +349,7 @@
        config.status computes it.
        * Makefile.in (epaths-force-w32): Move srcdir tweak here.
 
-       * autogen: Remove directory.  Move update_autogen to admin/.
+       * autogen/: Remove directory.  Move update_autogen to admin/.
        * autogen.sh: Remove reference to copy_autogen.
        * GNUmakefile (configure):
        * Makefile.in (bootstrap): Do not try to run copy_autogen.
@@ -13174,7 +13245,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.