From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 31 Dec 2012 12:45:05 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11fac8b2865ce3ed67c178a78bd37c8de709f9f7;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: enhance and tweak some texinfo tests
  tests: remove a redundant texinfo test
  tests: don't list a removed tests in XFAIL_TESTS
  tests: more explicative names for some tests
  cleanup: drop a redundant %?FIRST% transform
  maint: state when compatibility cruft should be removed or warned about

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

11fac8b2865ce3ed67c178a78bd37c8de709f9f7
diff --cc m4/obsolete-err.m4
index 77dab8c95,01c2d6ef9..875434262
--- a/m4/obsolete-err.m4
+++ b/m4/obsolete-err.m4
@@@ -18,12 -20,7 +20,14 @@@ AC_DEFUN([AM_PROG_CC_STDC]
      Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
      but upon 'ac_cv_prog_cc_stdc'.])])
  
++dnl TODO: Remove in Automake 1.16.
 +AC_DEFUN([AM_PROG_MKDIR_P],
 +[AC_FATAL(['$0': this macro is obsolete.
 +    You should simply use the 'AC][_PROG_MKDIR_P' macro instead, and
 +    use '$(MKDIR_P)' instead of '$(mkdir_p)' in your Makefile.am
 +    files.])])
 +
+ dnl TODO: Remove in Automake 1.14.
  AC_DEFUN([AM_C_PROTOTYPES],
           [AC_FATAL([automatic de-ANSI-fication support has been removed])])
  AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --cc t/list-of-tests.mk
index cd41e6aca,7b10d7cda..458a9e8d3
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@@ -1159,20 -1158,20 +1158,19 @@@ t/targetclash.sh 
  t/tests-environment-fd-redirect.sh \
  t/tests-environment-and-log-compiler.sh \
  t/txinfo.sh \
- t/txinfo2.sh \
- t/txinfo3.sh \
- t/txinfo4.sh \
- t/txinfo6.sh \
- t/txinfo7.sh \
- t/txinfo8.sh \
- t/txinfo9.sh \
+ t/txinfo-no-extra-dist.sh \
+ t/txinfo-suffix-less-info.sh \
+ t/txinfo-unrecognized-info-suffix.sh \
+ t/txinfo-other-suffixes.sh \
+ t/txinfo-add-missing-and-dist.sh \
+ t/txinfo-no-repeated-targets.sh \
  t/txinfo10.sh \
- t/txinfo13.sh \
- t/txinfo16.sh \
- t/txinfo17.sh \
+ t/txinfo-subdir-pr343.sh \
+ t/txinfo-info-in-srcdir.sh \
+ t/txinfo-setfilename-repeated.sh \
 -t/txinfo19.sh \
  t/txinfo20.sh \
- t/txinfo21.sh \
- t/txinfo22.sh \
+ t/txinfo-many-output-formats.sh \
+ t/txinfo-override-texinfo-tex.sh \
  t/txinfo23.sh \
  t/txinfo24.sh \
  t/txinfo25.sh \