From bc1038325d663ab99a6f01e4db172b02743d8319 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 6 Apr 2012 10:46:27 +0200 Subject: [PATCH] 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 --- NEWS | 13 ++++++++----- aclocal.in | 10 ---------- configure.ac | 10 ++++++++-- t/aclocal-acdir.sh | 26 +++----------------------- t/aclocal-print-acdir.sh | 3 --- 5 files changed, 19 insertions(+), 43 deletions(-) diff --git a/NEWS b/NEWS index 4e49512..993f41e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +New in 1.13: + +* Obsolete features removed: + + - The deprecated aclocal option '--acdir' has been removed. You + should use the options '--automake-acdir' and '--system-acdir' + instead (which have been introduced in Automake 1.11.2). + New in 1.12: * WARNING: Future backward-incompatibilities! @@ -45,11 +53,6 @@ New in 1.12: all be deprecated in the next minor version of Automake (1.12.1) and removed in the next major version (1.13). - - The '--acdir' option of aclocal is deprecated, and will probably - be removed in the next major Automake release (1.13). You should - use the options '--automake-acdir' and '--system-acdir' instead - (which have been introduced in Automake 1.11.2). - - The exact order in which the directories in the aclocal macro search path are looked up is probably going to be changed in the next Automake release (1.13). diff --git a/aclocal.in b/aclocal.in index 85528af..67af1a2 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, diff --git a/configure.ac b/configure.ac index 3f55df7..a331d9f 100644 --- a/configure.ac +++ b/configure.ac @@ -60,8 +60,14 @@ AC_SUBST([system_acdir], ["\${datadir}/aclocal"]) # $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir", # hence '.' is really what we want for perllibdir, libdir, and acdir. -ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" --acdir=m4 -I m4" -AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" --libdir=lib" +# Use '-I' with aclocal so that our own *.m4 files in m4/ gets included, +# not copied, in aclocal.m4. +ACLOCAL="\ + perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" \ + --automake-acdir=m4 --system-acdir=m4/acdir -I m4" +AUTOMAKE="\ + perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" \ + --libdir=lib" AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh index 88caef6..e5b2bd2 100755 --- a/t/aclocal-acdir.sh +++ b/t/aclocal-acdir.sh @@ -14,9 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Test aclocal's '--acdir', '--automake-acdir' and '--system-acdir' -# options. Also check that stuff in the automake acdir takes precedence -# over stuff in the system acdir. +# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also +# check that stuff in the automake acdir takes precedence over stuff in +# the system acdir. . ./defs || Exit 1 @@ -72,24 +72,4 @@ $FGREP 'fake--init--automake' configure $FGREP 'am--macro' configure $FGREP 'my--macro' configure && Exit 1 # Just to be sure. -rm -rf autom4te*.cache - -# Obsolescent '--acdir' option. -$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep '.*--acdir.*deprecated' stderr - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir am -$AUTOCONF --force -$FGREP 'fake--init--automake' configure -$FGREP 'am--macro' configure - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr - : diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh index 3d8bf4e..53ad556 100755 --- a/t/aclocal-print-acdir.sh +++ b/t/aclocal-print-acdir.sh @@ -22,9 +22,6 @@ am_create_testdir=empty $ACLOCAL --print-ac-dir test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir" -$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir -test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo - $ACLOCAL --system-acdir /bar --print-ac-dir test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar -- 2.7.4