Hash :
7326c52e
Author :
Date :
2012-11-24T20:32:48
aclocal: allow third-party macros take precedence over automake ones
It makes sense to allow "local system-wide" m4 macros take precedence
over built-in macros (defined in the aclocal versioned m4 directory
"${prefix}/share/aclocal-${APIVERSION}"), the same way we allow
"environment-level" m4 macros (through the ACLOCAL_PATH environment
variable ) take precedence over system-wide third-party macros.
An example: after this change, a definition of AM_PROG_VALAC placed
in file (say) '/usr/local/share/aclocal/my-vala.m4' should take
precedence over the same-named automake-provided macro defined in
file '/usr/local/share/aclocal-1.14/vala.m4'.
Even more importantly, after this change, m4 macros accessible
through $ACLOCAL_PATH entries will take precedence over m4 macros
defined in the aclocal versioned m4 directory; it was quite counter
intuitive that it was not the case before.
* aclocal.in (scan_m4_files): Search files in @system_includes before
files in @automake_includes.
* t/aclocal-acdir.sh: Adjust.
* t/aclocal-path-precedence.sh: Likewise.
* t/dirlist.sh: Likewise.
* doc/automake.texi: Adjust.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
#! /bin/sh
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check precedence rules for ACLOCAL_PATH.
am_create_testdir=empty
. test-init.sh
cat > configure.ac << 'END'
AC_INIT([foo], [1.0])
AM_INIT_AUTOMAKE
FOO_MACRO
BAR_MACRO
AC_PROG_LIBTOOL
AM_GNU_GETTEXT
END
mkdir mdir1 mdir2 mdir3 sysdir extradir
cat > mdir1/foo1.m4 << 'END'
AC_DEFUN([FOO_MACRO], [::pass-foo::])
END
cat > mdir2/foo2.m4 << 'END'
AC_DEFUN([FOO_MACRO], [::fail-foo::])
END
cat > mdir1/baz.m4 << 'END'
AC_DEFUN([BAR_MACRO], [::fail-bar::])
END
cat > mdir3/bar.m4 << 'END'
AC_DEFUN([BAR_MACRO], [::pass-bar::])
END
cat > mdir2/quux-a.m4 << 'END'
AC_DEFUN([AM_INIT_AUTOMAKE], [::pass-am-init::])
END
cat > mdir2/quux-b.m4 << 'END'
AC_DEFUN([AC_PROG_LIBTOOL], [::pass-libtool::])
END
cat > mdir2/quux-c.m4 << 'END'
AC_DEFUN([AM_GNU_GETTEXT], [::pass-gettext::])
END
cat > sysdir/libtool.m4 << 'END'
AC_DEFUN([AC_PROG_LIBTOOL], [::fail-libtool::])
END
cat > extradir/gettext.m4 << 'END'
AC_DEFUN([AM_GNU_GETTEXT], [::fail-gettext::])
END
echo ./extradir > sysdir/dirlist
ACLOCAL_PATH=mdir1:mdir2 $ACLOCAL -I mdir3 --system-acdir sysdir
$AUTOCONF
$FGREP '::' configure # For debugging.
# Directories coming first in ACLOCAL_PATH should take precedence
# over those coming later.
$FGREP '::pass-foo::' configure
# Directories from '-I' options should take precedence over directories
# in ACLOCAL_PATH.
$FGREP '::pass-bar::' configure
# Directories in ACLOCAL_PATH should take precedence over system acdir
# (typically '${prefix}/share/aclocal'), and any directory added through
# the 'dirlist' special file.
$FGREP '::pass-gettext::' configure
$FGREP '::pass-libtool::' configure
# Directories in ACLOCAL_PATH shoul take precedence over the internal
# automake acdir (typically '${prefix}/share/aclocal-${APIVERSION}').
$FGREP '::pass-am-init::' configure
# A final sanity check.
$FGREP '::fail' configure && exit 1
: