]> git.ipfire.org Git - thirdparty/automake.git/commit
aclocal: modernize and simplify AC_CONFIG_MACRO_DIR* tracing experimental/ac-config-macro-dir-simplify
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Nov 2012 18:54:52 +0000 (19:54 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 21 Feb 2013 16:04:57 +0000 (17:04 +0100)
commit45b5a9409a46cdc4bbef70bf9426689ea1411a4e
tree268bfcf56ba865198cdc5dcd398904ec3a8ff202
parenta5ed87e7944deaea33914230e3d67ff08eb18382
aclocal: modernize and simplify AC_CONFIG_MACRO_DIR* tracing

Do so by assuming that AC_CONFIG_MACRO_DIRS is defined, and that we can
handle it and AC_CONFIG_MACRO_DIR by tracing AC_CONFIG_MACRO_DIR_TRACE.
We can do so since Automake 1.14 will require Autoconf 2.70 or later.

* Makefile.am (automake_internal_acdir): Remove.
(dist_automake_internal_ac_DATA): Likewise.
* m4/internal/ac-config-macro-dirs.m4: Delete.
* aclocal.in (trace_used_macros): No longer pass the path of
'internal/ac-config-macro-dirs.m4' to the autom4te invocation.
No longer trace nor handle macros 'AC_CONFIG_MACRO_DIR' and
'_AM_CONFIG_MACRO_DIRS'.
No longer uniquify '@ac_config_macro_dirs' explicitly.
($ac_config_macro_dirs_fallback): Remove.
No longer emit its content in the generated aclocal.m4.
* t/aclocal-acdir.sh: Remove a now-unneeded workaround.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Makefile.am
aclocal.in
m4/internal/ac-config-macro-dirs.m4 [deleted file]
t/aclocal-acdir.sh