From MAILER-DAEMON Tue Jun 26 00:35:24 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SjNUq-0003X6-Hz
	for mharc-m4-commit@gnu.org; Tue, 26 Jun 2012 00:35:24 -0400
Received: from eggs.gnu.org ([208.118.235.92]:37532)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SjNUm-0003Ww-Qs
	for m4-commit@gnu.org; Tue, 26 Jun 2012 00:35:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SjNUj-0001Me-MA
	for m4-commit@gnu.org; Tue, 26 Jun 2012 00:35:20 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51864)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SjNUj-0001Lv-Hp
	for m4-commit@gnu.org; Tue, 26 Jun 2012 00:35:17 -0400
Received: from ericb by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SjNUi-0000AZ-RR
	for m4-commit@gnu.org; Tue, 26 Jun 2012 04:35:16 +0000
Date: Tue, 26 Jun 2012 04:35:16 +0000
Message-Id: <E1SjNUi-0000AZ-RR@vcs.savannah.gnu.org>
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
Subject: [SCM] GNU M4 source repository branch, branch-1.4,
	updated. v1.4.16-7-gb692198
X-Git-Refname: refs/heads/branch-1.4
X-Git-Reftype: branch
X-Git-Oldrev: 093333821247df7eaa51c66b2ecd93bb6d9a671c
X-Git-Newrev: b692198dd701f8391c8c278bc597b0b38f6f9dbf
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: m4-patches@gnu.org
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jun 2012 04:35:23 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=b692198dd701f8391c8c278bc597b0b38f6f9dbf

The branch, branch-1.4 has been updated
       via  b692198dd701f8391c8c278bc597b0b38f6f9dbf (commit)
       via  826fbca3a1359a0524ff05b9bf4b729562ad389a (commit)
      from  093333821247df7eaa51c66b2ecd93bb6d9a671c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b692198dd701f8391c8c278bc597b0b38f6f9dbf
Author: Eric Blake <eblake@redhat.com>
Date:   Mon Jun 25 22:09:58 2012 -0600

    maint: update copyright year
    
    * all files: Run 'make update-copyright'.

commit 826fbca3a1359a0524ff05b9bf4b729562ad389a
Author: Eric Blake <eblake@redhat.com>
Date:   Mon Jun 25 22:03:04 2012 -0600

    build: deal with newer glibc vs. FORTIFY_SOURCE
    
    Recent glibc (for whatever stupid reason) decided to issue a #warning
    when FORTIFY_SOURCE is requested but not possible, due to compilation
    without optimization.  But when debugging sources, we don't want our
    use of -Werror to kill compilation just because glibc wants to be
    chatty; when debugging, we don't care about source fortification.
    
    * configure.ac (FORTIFY_SOURCE): Make conditional on optimization.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 AUTHORS              |    2 +-
 BACKLOG              |    2 +-
 ChangeLog            |   10 +++++++++-
 HACKING              |    2 +-
 Makefile.am          |    2 +-
 NEWS                 |    2 +-
 README               |    2 +-
 THANKS               |    2 +-
 TODO                 |    2 +-
 acinclude.m4         |    2 +-
 bootstrap            |    2 +-
 c-boxes.el           |    2 +-
 cfg.mk               |    2 +-
 checks/Makefile.in   |    2 +-
 checks/check-them    |    2 +-
 checks/get-them      |    2 +-
 checks/stackovf.test |    2 +-
 configure.ac         |   11 ++++++++---
 doc/Makefile.am      |    2 +-
 doc/m4.texinfo       |    2 +-
 examples/COPYING     |    2 +-
 examples/Makefile.am |    2 +-
 lib/Makefile.am      |    2 +-
 src/Makefile.am      |    2 +-
 src/builtin.c        |    2 +-
 src/debug.c          |    2 +-
 src/eval.c           |    2 +-
 src/format.c         |    2 +-
 src/freeze.c         |    2 +-
 src/input.c          |    2 +-
 src/m4.c             |    2 +-
 src/m4.h             |    2 +-
 src/macro.c          |    2 +-
 src/output.c         |    2 +-
 src/path.c           |    2 +-
 src/symtab.c         |    2 +-
 tests/Makefile.am    |    2 +-
 37 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 667db4c..3c670d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,7 +32,7 @@ Tim Rice                    tim@multitalents.net          2011-01-24
 
 ========================================================================
 
-Copyright (C) 2000, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006-2007, 2009-2012 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/BACKLOG b/BACKLOG
index e1e2e06..b9e4cea 100644
--- a/BACKLOG
+++ b/BACKLOG
@@ -50,7 +50,7 @@ rmail/speed
  2. 05 Sep 94 <djm@va.pubnix.com> slowness
  3. 04 Oct 94 <pinard> Autoconf, m4, and dnl's.
 
-Copyright (C) 2000, 2006, 2009-2011 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2009-2012 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/ChangeLog b/ChangeLog
index 4908b5e..37e1e18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-25  Eric Blake  <eblake@redhat.com>
+
+	maint: update copyright year
+	* all files: Run 'make update-copyright'.
+
+	build: deal with newer glibc vs. FORTIFY_SOURCE
+	* configure.ac (FORTIFY_SOURCE): Make conditional on optimization.
+
 2011-05-02  Eric Blake  <eblake@redhat.com>
 
 	build: pick up latest gnulib fixes
@@ -5316,7 +5324,7 @@ Mon Jan 22 21:08:52 1990  Rene' Seindal (seindal at diku.dk)
 	coding: utf-8
 	End:
 
-	Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2011 Free Software
+	Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2012 Free Software
 	Foundation, Inc.
 
 	Copying and distribution of this file, with or without
diff --git a/HACKING b/HACKING
index 6e4552d..40a2c7e 100644
--- a/HACKING
+++ b/HACKING
@@ -322,7 +322,7 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
   After making edits, mail the diff to <bug-directory@gnu.org>.
 
 
-Copyright (C) 2004-2011 Free Software Foundation, Inc.
+Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
 The canonical source of this file is maintained with the
 GNU M4 package.  Report bugs to bug-m4@gnu.org.
diff --git a/Makefile.am b/Makefile.am
index c35d129..1556fd0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2000-2001, 2003-2011 Free Software Foundation, Inc.
+## Copyright (C) 2000-2001, 2003-2012 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/NEWS b/NEWS
index 26f63a0..78871eb 100644
--- a/NEWS
+++ b/NEWS
@@ -705,7 +705,7 @@ mode: outline
 fill-column: 75
 End:
 
-Copyright (C) 1992-1994, 2004-2011 Free Software Foundation, Inc.
+Copyright (C) 1992-1994, 2004-2012 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README b/README
index e9e2804..bc0fdaf 100644
--- a/README
+++ b/README
@@ -66,7 +66,7 @@ note that the range specifies every single year in that closed interval.
 
 ========================================================================
 
-Copyright (C) 2000, 2005-2011 Free Software Foundation, Inc.
+Copyright (C) 2000, 2005-2012 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/THANKS b/THANKS
index 082e7e8..b2639b2 100644
--- a/THANKS
+++ b/THANKS
@@ -137,7 +137,7 @@ Local Variables:
 coding: utf-8
 End:
 
-Copyright (C) 2000, 2006-2011 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006-2012 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/TODO b/TODO
index 935fcdc..86ecece 100644
--- a/TODO
+++ b/TODO
@@ -37,7 +37,7 @@ mode: outline
 outline-regexp: " *[-+*.] \\|"
 End:
 
-Copyright (C) 2000, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006-2007, 2009-2012 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/acinclude.m4 b/acinclude.m4
index 3d6d011..a942cfc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,5 @@
 # Local additions to Autoconf macros.
-# Copyright (C) 1992, 1994, 2004, 2006, 2008-2011 Free Software
+# Copyright (C) 1992, 1994, 2004, 2006, 2008-2012 Free Software
 # Foundation, Inc.
 # Francois Pinard <pinard@iro.umontreal.ca>, 1992.
 #
diff --git a/bootstrap b/bootstrap
index d4cf385..b5d740c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,7 +3,7 @@
 # bootstrap (GNU M4) version 2010-03-02
 # Written by Gary V. Vaughan  <gary@gnu.org>
 
-# Copyright (C) 2004-2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU M4.
 #
diff --git a/c-boxes.el b/c-boxes.el
index 888f3c0..7560b87 100644
--- a/c-boxes.el
+++ b/c-boxes.el
@@ -1,5 +1,5 @@
 ;;; Boxed comments for C mode.
-;;; Copyright (C) 1991-1994, 2008-2011 Free Software Foundation, Inc.
+;;; Copyright (C) 1991-1994, 2008-2012 Free Software Foundation, Inc.
 ;;; Francois Pinard <pinard@iro.umontreal.ca>, April 1991.
 ;;;
 ;;; This file is part of GNU M4.
diff --git a/cfg.mk b/cfg.mk
index b0ffdfe..31de2de 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk.                           -*- makefile -*-
-# Copyright (C) 2003-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/checks/Makefile.in b/checks/Makefile.in
index 7f6f764..d541f08 100644
--- a/checks/Makefile.in
+++ b/checks/Makefile.in
@@ -1,6 +1,6 @@
 ## Makefile.in - template for building Makefile for M4 testsuite.
 ##
-## Copyright (C) 1992-1994, 2006-2011 Free Software Foundation, Inc.
+## Copyright (C) 1992-1994, 2006-2012 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/checks/check-them b/checks/check-them
index b936a2a..8a10875 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Check GNU m4 against examples from the manual source.
-# Copyright (C) 1992, 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 1992, 2006-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/checks/get-them b/checks/get-them
index 8f953b7..2fcb396 100755
--- a/checks/get-them
+++ b/checks/get-them
@@ -1,7 +1,7 @@
 #!/bin/sh
 # -*- AWK -*-
 # Extract all examples from the manual source.
-# Copyright (C) 1992, 2005-2011 Free Software Foundation, Inc.
+# Copyright (C) 1992, 2005-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/checks/stackovf.test b/checks/stackovf.test
index 4b8e139..aac2ca4 100755
--- a/checks/stackovf.test
+++ b/checks/stackovf.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of the GNU m4 testsuite
-# Copyright (C) 2000, 2003, 2007-2011 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2003, 2007-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/configure.ac b/configure.ac
index 17f23e7..8eecef3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Configure template for GNU M4.           -*-Autoconf-*-
-# Copyright (C) 1991, 1993-1994, 2004-2011 Free Software Foundation,
+# Copyright (C) 1991, 1993-1994, 2004-2012 Free Software Foundation,
 # Inc.
 #
 # This file is part of GNU M4.
@@ -85,8 +85,13 @@ if test "$gl_gcc_warnings" = yes; then
 
   AC_SUBST([WARN_CFLAGS])
 
-  AC_DEFINE([_FORTIFY_SOURCE], [2],
-    [enable compile-time and run-time bounds-checking, and some warnings])
+  AH_VERBATIM([FORTIFY_SOURCE],
+  [/* Enable compile-time and run-time bounds-checking, and some warnings,
+      without upsetting newer glibc. */
+   #if defined __OPTIMIZE__ && __OPTIMIZE__
+   # define _FORTIFY_SOURCE 2
+   #endif
+  ])
 fi
 
 # Tandem/NSK is broken - it has 'long long int' but not
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9d3391d..7907881 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006-2011 Free Software Foundation, Inc.
+## Copyright (C) 2006-2012 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 1dcc8e4..a1ead11 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -43,7 +43,7 @@ This manual (@value{UPDATED}) is for GNU M4 (version
 @value{VERSION}), a package containing an implementation of the m4 macro
 language.
 
-Copyright @copyright{} 1989-1994, 2004-2011 Free Software Foundation,
+Copyright @copyright{} 1989-1994, 2004-2012 Free Software Foundation,
 Inc.
 
 @quotation
diff --git a/examples/COPYING b/examples/COPYING
index 2777673..7e73a12 100644
--- a/examples/COPYING
+++ b/examples/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
 The following copyright notice applies to each of these
 description files.
 
-Copyright (C) 2006, 2010-2011 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010-2012 Free Software Foundation, Inc.
 This file is free software; the Free Software Foundation
 gives unlimited permission to copy and/or distribute it,
 with or without modifications, as long as this notice is preserved.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4e0016b..dd65d98 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006-2011 Free Software Foundation, Inc.
+## Copyright (C) 2006-2012 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 064edaf..7aff3d4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2009-2011 Free Software Foundation, Inc.
+## Copyright (C) 2009-2012 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/src/Makefile.am b/src/Makefile.am
index b9b809d..750a3a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006-2011 Free Software Foundation, Inc.
+## Copyright (C) 2006-2012 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/src/builtin.c b/src/builtin.c
index 80f2024..d8c9bd5 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2000, 2004, 2006-2011 Free Software
+   Copyright (C) 1989-1994, 2000, 2004, 2006-2012 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/debug.c b/src/debug.c
index 0fef85c..747bf79 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1991-1994, 2004, 2006-2007, 2009-2011 Free Software
+   Copyright (C) 1991-1994, 2004, 2006-2007, 2009-2012 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/eval.c b/src/eval.c
index b74bce8..7550cc0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2007, 2009-2011 Free Software
+   Copyright (C) 1989-1994, 2006-2007, 2009-2012 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/format.c b/src/format.c
index 43a23cd..4b7f022 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 2006-2012 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/freeze.c b/src/freeze.c
index bf47376..3d2926e 100644
--- a/src/freeze.c
+++ b/src/freeze.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 2006-2012 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/input.c b/src/input.c
index be259a0..74fdf46 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2011 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 2004-2012 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/m4.c b/src/m4.c
index 6f1645a..d4c2681 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2011 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 2004-2012 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/m4.h b/src/m4.h
index 3708a7c..a8d96ea 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2011 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 2004-2012 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/macro.c b/src/macro.c
index e2e2499..8070a16 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2007, 2009-2011 Free Software
+   Copyright (C) 1989-1994, 2006-2007, 2009-2012 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/output.c b/src/output.c
index 91ff9f0..ef0f239 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2011 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 2004-2012 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/path.c b/src/path.c
index 0e3c6e5..65ecb3e 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1993, 2004, 2006-2011 Free Software Foundation,
+   Copyright (C) 1989-1993, 2004, 2006-2012 Free Software Foundation,
    Inc.
 
    This file is part of GNU M4.
diff --git a/src/symtab.c b/src/symtab.c
index 4965027..eeec2cf 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2003, 2006-2011 Free Software Foundation,
+   Copyright (C) 1989-1994, 2003, 2006-2012 Free Software Foundation,
    Inc.
 
    This file is part of GNU M4.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 669f296..3a10de7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2009-2011 Free Software Foundation, Inc.
+## Copyright (C) 2009-2012 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##


hooks/post-receive
-- 
GNU M4 source repository


From MAILER-DAEMON Tue Jun 26 21:25:48 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Sjh0u-00053R-6S
	for mharc-m4-commit@gnu.org; Tue, 26 Jun 2012 21:25:48 -0400
Received: from eggs.gnu.org ([208.118.235.92]:58202)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Sjh0q-00050y-F9
	for m4-commit@gnu.org; Tue, 26 Jun 2012 21:25:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Sjh0o-0008EA-5Y
	for m4-commit@gnu.org; Tue, 26 Jun 2012 21:25:43 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:36164)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Sjh0n-0008Dq-VU
	for m4-commit@gnu.org; Tue, 26 Jun 2012 21:25:42 -0400
Received: from ericb by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Sjh0n-0004HJ-Dm
	for m4-commit@gnu.org; Wed, 27 Jun 2012 01:25:41 +0000
Date: Wed, 27 Jun 2012 01:25:41 +0000
Message-Id: <E1Sjh0n-0004HJ-Dm@vcs.savannah.gnu.org>
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
Subject: [SCM] GNU M4 source repository branch, branch-1.4,
	updated. v1.4.16-8-g1000079
X-Git-Refname: refs/heads/branch-1.4
X-Git-Reftype: branch
X-Git-Oldrev: b692198dd701f8391c8c278bc597b0b38f6f9dbf
X-Git-Newrev: 100007945eb513e9f2a4baa436ce5cbca51334b2
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: m4-patches@gnu.org
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jun 2012 01:25:46 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=100007945eb513e9f2a4baa436ce5cbca51334b2

The branch, branch-1.4 has been updated
       via  100007945eb513e9f2a4baa436ce5cbca51334b2 (commit)
      from  b692198dd701f8391c8c278bc597b0b38f6f9dbf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 100007945eb513e9f2a4baa436ce5cbca51334b2
Author: Eric Blake <eblake@redhat.com>
Date:   Tue Jun 26 18:23:34 2012 -0600

    build: get missing from automake, not gnulib
    
    Automake recently changed 'missing' in a backwards-incompatible
    manner (that is, the 'missing' from newer automake won't meet the
    usage pattern of a makefile generated by an older automake).
    While this has since been fixed, the consensus was that gnulib
    should not be tracking 'missing' in the first place, since it is
    too heavily tied to automake internals and not independently
    useful.  We can prepare for this by getting 'missing' as part of
    our bootstrap process instead of linking into gnulib.
    
    See https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00154.html
    for more discussion.
    
    * build-aux/missing: Break link to gnulib.
    * .gitignore: Reflect this.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore        |    1 +
 ChangeLog         |    6 ++++++
 build-aux/missing |    1 -
 3 files changed, 7 insertions(+), 1 deletions(-)
 delete mode 120000 build-aux/missing

diff --git a/.gitignore b/.gitignore
index 0ea0794..0aac84c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 .version
 aclocal.m4
 autom4te.cache
+/build-aux/missing
 config.cache
 /config.guess
 config.h
diff --git a/ChangeLog b/ChangeLog
index 37e1e18..8b186c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-26  Eric Blake  <eblake@redhat.com>
+
+	build: get missing from automake, not gnulib
+	* build-aux/missing: Break link to gnulib.
+	* .gitignore: Reflect this.
+
 2012-06-25  Eric Blake  <eblake@redhat.com>
 
 	maint: update copyright year
diff --git a/build-aux/missing b/build-aux/missing
deleted file mode 120000
index 9b777ed..0000000
--- a/build-aux/missing
+++ /dev/null
@@ -1 +0,0 @@
-../gnulib/build-aux/missing
\ No newline at end of file


hooks/post-receive
-- 
GNU M4 source repository


