From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 31 Dec 2012 13:58:00 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab76d22dd759153542c2133fbc99c591e17e6791;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  docs: adjust comment w.r.t. recent tests renaming
  tests: some more renames for texinfo tests
  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

+ Non-trivial extra edits

* t/txinfo-other-suffixes.sh: Remove, Automake-NG only supports
'.texi' ad suffix for Texinfo files.
* t/txinfo-without-info-suffix.sh: Remove, Automake-NG doesn't
support generating suffix-less info files.
* t/txinfo-no-repeated-targets.sh: Remove, superseded by test
't/txinfo-rules-once.sh' (see [ng] commit v1.12.1-416-gd5459b9).
* t/txinfo-dvi-recurs.sh: Remove, basically an obsolete grepping
test (as was the test 'txinfo10.sh' this was renamed from; see
[ng] commit v1.12.2-887-gb80d8d2).

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

ab76d22dd759153542c2133fbc99c591e17e6791
diff --cc lib/Automake/Options.pm
index 77e9cbdbd,9e06599f9..a3b8193a6
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@@ -309,6 -315,14 +309,7 @@@ sub _process_option_list (\%@
          {
            set_strictness ($_);
          }
 -      # TODO: Remove this special check in Automake 1.14 or 1.15.
 -      elsif (/^(.*\/)?ansi2knr$/)
 -        {
 -          # Obsolete (and now removed) de-ANSI-fication support.
 -          error ($where,
 -                 "automatic de-ANSI-fication support has been removed");
 -        }
+       # TODO: Remove this special check in Automake 1.15.
        elsif ($_ eq 'cygnus')
          {
            error $where, "support for Cygnus-style trees has been removed";
diff --cc t/txinfo-no-extra-dist.sh
index f5664885b,ea8f89e3c..177007c71
--- a/t/txinfo-no-extra-dist.sh
+++ b/t/txinfo-no-extra-dist.sh
@@@ -24,11 -24,15 +24,18 @@@ AC_OUTPU
  END
  
  cat > Makefile.am << 'END'
- info_TEXINFOS = textutils.texi
- .PHONY: test
- test:
+ info_TEXINFOS = textutils.texi subdir/main.texi
+ test: distdir
 -	@echo DISTFILES = $(DISTFILES)
 -	@case '$(DISTFILES)' in *'~'*|*'.bak'*) exit 1;; *) exit 0;; esac
 -	st=0; \
 +	@echo am.dist.all-files = $(am.dist.all-files)
- 	case '$(am.dist.all-files)' in *'~'*) exit 1;; *) exit 0;; esac
++	@case '$(am.dist.all-files)' in \
++          *'~'*|*'.bak'*) exit 1;; \
++          *) exit 0;; \
++        esac
++	@st=0; \
+ 	 find $(distdir) | grep '~' && st=1; \
+ 	 find $(distdir) | grep '\.bak' && st=1; \
+ 	 exit $$st
+ PHONY: test
  END
  
  : > texinfo.tex