diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-06 11:02:38 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-06 11:02:38 +0200 |
| commit | 371bdf6bf8b61c3b78c8915068b5b806ec2b62cf (patch) | |
| tree | f4b9f50d2510954bf91c8198502cfa5f497e5042 /lib/Automake | |
| parent | 5957249003ff8a68044602cf10aaaf31480edb99 (diff) | |
| parent | 8bae346819ce77fa3d653af4abfc6f1da9788303 (diff) | |
| download | automake-371bdf6bf8b61c3b78c8915068b5b806ec2b62cf.tar.gz | |
Merge branch 'master' into test-protocols
* master:
* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
fix: list test 'vala-vpath.test' in XFAIL_TESTS
tests: simplify wrapper for aclocal
fix: minor typo in ChangeLog
automake: fix regression due to de-ansification support removal
coverage: vala support failing for VPATH from-scratch builds
docs: report few more automake parsing limitations
automake: cleanups after de-ansification support removal (2)
automake: cleanups after de-ansification support removal (1)
ansi: remove obsolete code/files for de-ANSI-fication support
ansi: reject attempts to use automatic de-ANSI-fication support
tests: remove tests about obsolete de-ANSI-fication support
docs: remove description of de-ANSI-fication support from manual
Diffstat (limited to 'lib/Automake')
| -rw-r--r-- | lib/Automake/Options.pm | 14 | ||||
| -rw-r--r-- | lib/Automake/Variable.pm | 2 |
2 files changed, 4 insertions, 12 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' diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 24d8be0ff..cd57877ae 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -156,7 +156,6 @@ my %_gen_varname_n = (); # Macros accessible via aclocal. my %_am_macro_for_var = ( - ANSI2KNR => 'AM_C_PROTOTYPES', CCAS => 'AM_PROG_AS', CCASFLAGS => 'AM_PROG_AS', EMACS => 'AM_PATH_LISPDIR', @@ -169,7 +168,6 @@ my %_am_macro_for_var = pyexecdir => 'AM_PATH_PYTHON', PYTHON => 'AM_PATH_PYTHON', pythondir => 'AM_PATH_PYTHON', - U => 'AM_C_PROTOTYPES', ); # Macros shipped with Autoconf. |