From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 21 Apr 2014 14:12:29 +0000 (+0100)
Subject: Merge branch 'minor'
X-Git-Tag: v1.16~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a000546bca6d93e3eb3d1a549cc34948d2bbd56f;p=thirdparty%2Fautomake.git

Merge branch 'minor'

* minor:
  maint: update copyright years
  maint: sync files from upstream ("make fetch")

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

a000546bca6d93e3eb3d1a549cc34948d2bbd56f
diff --cc bootstrap.sh
index c8eb5def9,45b42bb00..0ae381e2a
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@@ -39,8 -37,17 +39,8 @@@ PACKAGE=automak
  datadir=.
  # This should be automatically updated by the 'update-copyright'
  # rule of our Makefile.
- RELEASE_YEAR=2013
+ RELEASE_YEAR=2014
  
 -# Override SHELL.  This is required on DJGPP so that Perl's system()
 -# uses bash, not COMMAND.COM which doesn't quote arguments properly.
 -# It's not used otherwise.
 -if test -n "$DJDIR"; then
 -  BOOTSTRAP_SHELL=/dev/env/DJDIR/bin/bash.exe
 -else
 -  BOOTSTRAP_SHELL=/bin/sh
 -fi
 -
  # Read the rule for calculating APIVERSION and execute it.
  apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
  eval "$apiver_cmd"
diff --cc m4/obsolete.m4
index 28151d8d1,9905156a6..9579f820a
--- a/m4/obsolete.m4
+++ b/m4/obsolete.m4
@@@ -1,7 -1,8 +1,7 @@@
  #  -*- Autoconf -*-
 -# Obsolete and "removed" macros, that must however still report explicit
 -# error messages when used, to smooth transition.
 +# Deprecated, obsolescent or and obsolete macros.
  #
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,