Merge branch 'minor'

diff --cc bin/automake.in
Simple merge

diff --cc bootstrap
index 3b11cd869ad3887bf869c6c1d4978f492d5c49da,d0766d4c843d7c97bb45e2c0cddfde972e43165f..82ed9937b43b6af8967828d553f7605e74e5b519
--- 1/bootstrap.sh
--- 2/bootstrap
+++ b/bootstrap
@@@ -39,8 -41,17 +43,8 @@@ PACKAGE=automak
  datadir=.
  # This should be automatically updated by the 'update-copyright'
  # rule of our Makefile.
- RELEASE_YEAR=2015
+ RELEASE_YEAR=2017
  
 -# 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 configure.ac
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc lib/texinfo.tex
index ab55d5b0c45c833001c9a1ac1f2b8bdb05d98f16,9c5e0fc0806d39da90c938de0fbd6e703a522c3c..371f60e45e9e51116a3ed467dc00f1f26a0471be
--- 1/lib/texinfo.tex
--- 2/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@@ -3,9 -3,12 +3,12 @@@
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
- \def\texinfoversion{2013-02-01.11}
 -\def\texinfoversion{2017-03-05.09}
++\def\texinfoversion{2017-06-16.23}
  %
- % Copyright 1985-2017 Free Software Foundation, Inc.
+ % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+ % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ % 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
+ % Free Software Foundation, Inc.
  %
  % This texinfo.tex file is free software: you can redistribute it and/or
  % modify it under the terms of the GNU General Public License as

diff --cc t/distcheck-Tpo.sh
Simple merge

diff --cc t/gettext-macros.sh
index 34f4e9c0e3d1a31c80af9d5376bec6dd57748d87,10baffa54251a2d0052b7d292151ed085c3fe090..a8185af845f66a02be17c5ede947c3cf53f7f14f
--- 1/t/gettext-macros.sh
--- 2/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@@ -28,29 -28,19 +28,20 @@@ extract_program_version (
  echo "# Automatically generated by $me." > get.sh
  echo : >> get.sh
  
- # The 'gettextize' and 'autopoint' scripts will look into Makefile.am.
+ # The 'autopoint' script will look into Makefile.am.
 -echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
 +echo AUTOMAKE_OPTIONS = -Wno-obsolete > Makefile.am
 +echo ACLOCAL_AMFLAGS = -I m4 >> Makefile.am
  
- # Prefer autopoint to gettextize, since the more modern versions of the
- # latter might unconditionally require user interaction to complete;
- # yes, this means confirmation from /dev/tty (!) -- see:
+ # Prefer autopoint to gettextize, since the latter unconditionally
+ # requires user interaction to complete; yes, this means confirmation
+ # from /dev/tty (!) -- see:
  #  <http://lists.gnu.org/archive/html/bug-gettext/2011-12/msg00000.html>
- # Since this "forced interaction" behaviour of gettextize wasn't present
- # before the introduction of autopoint, we should be able to safely
- # fall back to calling gettextize non-interactively if autopoint is not
- # present.
- if autopoint --version; then
-   am_gettextize_command=autopoint
- else
-   am_gettextize_command=gettextize
- fi
  
- # We will need to specify the correct autopoint (or gettextize) version
- # in the AM_GNU_GETTEXT_VERSION call in configure.ac if we want autopoint
- # (or gettextize) to setup the correct infrastructure -- in particular,
- # for what concerns us, to bring in all the required .m4 files.
- autopoint_version=$(extract_program_version $am_gettextize_command) \
+ # We will need to specify the correct autopoint version in the
+ # AM_GNU_GETTEXT_VERSION call in configure.ac if we want autopoint to
+ # setup the correct infrastructure -- in particular, for what concerns
+ # us, to bring in all the required .m4 files.
+ autopoint_version=$(extract_program_version autopoint) \
    && test -n "$autopoint_version" \
    || autopoint_version=0.10.35
  

diff --cc t/includes-deprecation.sh
Simple merge