summaryrefslogtreecommitdiff
path: root/lib/Automake
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-28 15:52:11 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-08-28 20:25:09 +0200
commit16f67b47492d97cac0866b02304b08fdde4d069e (patch)
tree80119f9e080982f3c3fee69e933d394d51ff4a0b /lib/Automake
parent1a1c1339db861cee13ed8b8b05b0c41428214b7a (diff)
downloadautomake-16f67b47492d97cac0866b02304b08fdde4d069e.tar.gz
ansi: reject attempts to use automatic de-ANSI-fication support
* tests/protos.m4 (AM_C_PROTOTYPES): Error out whenever called. * lib/Automake/Options.pm (_process_option_list ): Error out with a proper error message when the `ansi2knr' option is used. Related updates to comments. * tests/depacl2.test: Update. * tests/ansi2knr-no-more.test: New test. * tests/Makefile.am (TESTS): Add it. * NEWS: Update.
Diffstat (limited to 'lib/Automake')
-rw-r--r--lib/Automake/Options.pm14
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index e8765fdf1..6836157a3 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -71,8 +71,7 @@ F<Makefile.am>s.
=cut
-# Values are the Automake::Location of the definition, except
-# for 'ansi2knr' whose value is a pair [filename, Location].
+# Values are the Automake::Location of the definition.
use vars '%_options'; # From AUTOMAKE_OPTIONS
use vars '%_global_options'; # from AM_INIT_AUTOMAKE or the command line.
@@ -269,14 +268,9 @@ sub _process_option_list (\%@)
}
elsif (/^(.*\/)?ansi2knr$/)
{
- # This feature is deprecated, will be removed in the next
- # Automake major release.
- msg 'obsolete', $where,
- "automatic de-ANSI-fication support is deprecated\n";
- # An option like "../lib/ansi2knr" is allowed. With no
- # path prefix, we assume the required programs are in this
- # directory. We save the actual option for later.
- $options->{'ansi2knr'} = [$_, $where];
+ # Obsolete (and now removed) de-ANSI-fication support.
+ error ($where,
+ "automatic de-ANSI-fication support has been removed");
}
elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
|| $_ eq 'dist-shar' || $_ eq 'dist-zip'