Merge branch 'maint'

* maint:
  NEWS: minor fixup
  obsolete: better error message if AM_PROG_CC_STDC is used
  obsolete: better error message if AM_CONFIG_HEADER is used
  sync: update files from upstream with "make fetch"
  tests: better names for temporary configure.ac files

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

diff --cc Makefile.am
index 1dc51880004b4cc99ca11cfa10a205e1c8c8771c,8d8e033c8652731199577ff45bd62a21340c475c..42b1999680cf6aba2d70377f4e8a229563c56c1d
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -280,8 -282,9 +280,8 @@@ dist_automake_ac_DATA = 
    m4/make.m4 \
    m4/minuso.m4 \
    m4/missing.m4 \
 -  m4/mkdirp.m4 \
+   m4/obsolete-err.m4 \
    m4/options.m4 \
-   m4/protos.m4 \
    m4/python.m4 \
    m4/runlog.m4 \
    m4/sanity.m4 \

diff --cc NEWS
index faf79fda5334e2554e19b61407c4db67a7738fcd,ef1e953fca0414cbf3ed8c0d283a373624d9052b..7bfaccb3e5d5755e3a9605790bd2d9959d04b367
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,53 -1,4 +1,53 @@@
- New in 1.13:
 +New in 1.14:
 +
 +* Aclocal search path:
 +
 +  - Third-party m4 files located in the system-wide aclocal directory,
 +    as well as in any directory listed in the ACLOCAL_PATH environment
 +    variable, now take precedence over "built-in" Automake macros.
 +    For example, assuming Automake is installed in the '/usr/local'
 +    hierarchy, a definition of the AM_PROG_VALAC macro found in file
 +    (say) '/usr/local/share/aclocal/my-vala.m4' should take precedence
 +    over the same-named automake-provided macro, as defined in file
 +    '/usr/local/share/aclocal-1.14/vala.m4'.
 +
 +* Obsolescent features flagged:
 +
 +  - Use of the special makefile variable 'ACLOCAL_AMFLAGS' is deprecated.
 +    To specify locations of extra m4 files, the 'AC_CONFIG_MACRO_DIR' or
 +    'AC_CONFIG_MACRO_DIRS' (the latter introduced with autoconf 2.70)
 +    should be used instead.  And use of the '--install' aclocal option in
 +    'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
 +    bug#9037.
 +
 +* Obsolete features removed:
 +
 +  - Support for the long-deprecated name 'configure.in' for the Autoconf
 +    input file has been removed altogether.  Just use the modern name
 +    'configure.ac' instead.
 +
 +  - Support for the long-obsolete variable $(ACLOCAL_M4_SOURCES) has
 +    been removed.  It should be safe to simply remove any definition
 +    of it you have in your Makefiles.
 +
 +  - Support for the long-obsolete $(INCLUDES) variable has been finally
 +    removed, in favour of the modern equivalent $(AM_CPPFLAGS).
 +
 +* Removed support for obsolete platforms:
 +
 +  - Support for the SGI C/C++ compilers has been removed: these compilers
 +    are only meant to run on IRIX, and that system has seen its last
 +    release in 2006, and is expected to lose support from SGI in December
 +    2013; see <http://www.sgi.com/services/support/irix_mips_support.html>
 +    for more information.
 +
 +  - Support for DJGPP on MS-DOS and/or Windows 95/98/ME has been removed.
 +    Note that both Cygwin and MSYS/MinGW on modern Windows versions will
 +    continue to be fully supported.
 +
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
+ New in 1.13.1:
  
  * WARNING: Future backward-incompatibilities!
  

diff --cc t/list-of-tests.mk
Simple merge