diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-06 10:46:27 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-27 23:43:36 +0200 |
| commit | bc1038325d663ab99a6f01e4db172b02743d8319 (patch) | |
| tree | 969e582bd8a3ec51da1532a9ae7a78f9635eef5e /aclocal.in | |
| parent | 8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69 (diff) | |
| download | automake-bc1038325d663ab99a6f01e4db172b02743d8319.tar.gz | |
aclocal: remove the --acdir option
It not documented in the manual anymore, its use has already been
causing a deprecation warning, and its oncoming removal has already
been announced in the NEWS file. So let's finally remove it.
* aclocal.in (parse_arguments): Don't recognize the '--acdir' option
anymore.
(handle_acdir_option): Remove subroutine.
* configure.ac ($ACLOCAL): Adjust.
($AUTOMAKE): Cosmetic changes, for consistency.
* tests/aclocal-acdir.test: Remove usages of the '--acdir' option.
* tests/aclocal-print-acdir.test: Likewise.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'aclocal.in')
| -rw-r--r-- | aclocal.in | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/aclocal.in b/aclocal.in index 85528af49..67af1a27e 100644 --- a/aclocal.in +++ b/aclocal.in @@ -947,15 +947,6 @@ EOF exit 0; } -# Using --acdir overrides both the automake (versioned) directory and -# the public (unversioned) system directory. This usage is obsolete. -sub handle_acdir_option ($$) -{ - msg 'obsolete', '', "'--acdir' is deprecated\n"; - @system_includes = ($_[1]); - @automake_includes = (); -} - # Parse command line. sub parse_arguments () { @@ -966,7 +957,6 @@ sub parse_arguments () ( 'help' => sub { usage(0); }, 'version' => \&version, - 'acdir=s' => \&handle_acdir_option, 'system-acdir=s' => sub { shift; @system_includes = @_; }, 'automake-acdir=s' => sub { shift; @automake_includes = @_; }, 'diff:s' => \$diff_command, |