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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/automake.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/automake.texi b/doc/automake.texi index 0118a2125..c0b1abf79 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -3605,10 +3605,10 @@ will be almost impossible to share macros between packages. The second possibility, which we do recommend, is to write each macro in its own file and gather all these files in a directory. This directory is usually called @file{m4/}. Then it's enough to update -@file{configure.ac} by adding a proper call to @code{AC_CONFIG_MACRO_DIR}: +@file{configure.ac} by adding a proper call to @code{AC_CONFIG_MACRO_DIRS}: @example -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4]) @end example @command{aclocal} will then take care of automatically adding @file{m4/} @@ -3731,7 +3731,7 @@ MyPackage uses an @file{m4/} directory to store local macros as explained in @ref{Local Macros}, and has @example -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4]) @end example @noindent |