diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-02-20 22:14:55 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-02-20 22:14:55 +0100 |
commit | 5daad7029bfc62932b84517b49c73b38bd5c750c (patch) | |
tree | a6c6afd1639da3ffa3f4281209a9677945bfd325 /lib/Automake/Options.pm | |
parent | 9829cf24dad4310de0dbfbc3732f6c439b8e6931 (diff) | |
parent | b7ac9a37b3c7c78db1ba2beb32cf10bda9db996b (diff) | |
download | automake-5daad7029bfc62932b84517b49c73b38bd5c750c.tar.gz |
Merge branch 'branch-1.13.2' into maint
* branch-1.13.2:
coverage: expose automake bug#13760
tests: refactor/enhance tests about make dry-run mode
maint: describe new versioning and branching scheme, and adjust to it
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib/Automake/Options.pm')
-rw-r--r-- | lib/Automake/Options.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index 39327981a..191e9d50c 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -316,7 +316,7 @@ sub _process_option_list (\%@) { set_strictness ($_); } - # TODO: Remove this special check in Automake 1.14 or 1.15. + # TODO: Remove this special check in Automake 3.0. elsif (/^(.*\/)?ansi2knr$/) { # Obsolete (and now removed) de-ANSI-fication support. @@ -328,7 +328,7 @@ sub _process_option_list (\%@) { error $where, "support for Cygnus-style trees has been removed"; } - # TODO: Remove this special check in Automake 1.14 or 1.15. + # TODO: Remove this special check in Automake 3.0. elsif ($_ eq 'dist-lzma') { error ($where, "support for lzma-compressed distribution " . |