diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-14 16:54:38 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-15 13:47:03 +0100 |
| commit | 326cd5f0797b32616a7a6caaa854b04c4ebd53f7 (patch) | |
| tree | b32508f7540875fd4afb81c784adbe67a0e35e14 /t/subpkg-macrodir.sh | |
| parent | b7c507eadfa7b9ef40ba433dee0d231432ab7c39 (diff) | |
| download | automake-326cd5f0797b32616a7a6caaa854b04c4ebd53f7.tar.gz | |
aclocal: tracing AC_CONFIG_MACRO_DIRS can work with older autoconf as well
This will allow our users to interact also with pre-2.70 autoconf without
need for the user to add ACLOCAL_AMFLAGS in Makefile.am. For example,
before this change, in order to have aclocal look for macros in 'm4/dir1'
and 'm4/dir2' also when (say) autoconf 2.69 was used, our users would
have had to add something like:
ACLOCAL_AMFLAGS = -I m4/dir1 -I m4/dir2
in Makefile.am, in addition to the
AC_CONFIG_MACRO_DIRS([m4/dir1 m4/dir2])
in configure.ac. Now, the AC_CONFIG_MACRO_DIRS call is enough.
See the long-winded discussion on automake bug#12845 for more details:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12845>
* aclocal.in ($ac_config_macro_dirs_fallback): New global variable,
contains m4 code to issue a fallback definition of AC_CONFIG_MACRO_DIRS
as an alias for the private macro _AM_CONFIG_MACRO_DIRS.
(trace_used_macros): Handle and trace that macro. Do some code
reorganization and fix related botched indentation while at it.
(write_aclocal): Output '$ac_config_macro_dirs_fallback' early in
the generated aclocal.m4.
* t/aclocal-macrodirs.tap: Run unconditionally, even with older
autoconf.
* t/subpkg-macrodir.sh: Likewise.
* doc/automake.texi: Document only AC_CONFIG_MACRO_DIRS, rather
than AC_CONFIG_MACRO_DIR.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/subpkg-macrodir.sh')
| -rwxr-xr-x | t/subpkg-macrodir.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/t/subpkg-macrodir.sh b/t/subpkg-macrodir.sh index 275af0d64..a16f42b64 100755 --- a/t/subpkg-macrodir.sh +++ b/t/subpkg-macrodir.sh @@ -19,12 +19,6 @@ . test-init.sh -{ $AUTOCONF -o /dev/null - <<END - AC_INIT([x], [0]) - AC_CONFIG_MACRO_DIRS([.]) -END -} || skip_ "autoconf doesn't define the AC_CONFIG_MACRO_DIRS macro" - cat > configure.ac <<'END' AC_INIT([super], [1.0]) AM_INIT_AUTOMAKE |