[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, experimental/ac-config-macr
From: |
Stefano Lattarini |
Subject: |
[Automake-commit] [SCM] GNU Automake branch, experimental/ac-config-macro-dir-moreargs, created. v1.12.1-200-g8b3b5c8 |
Date: |
Wed, 04 Jul 2012 14:54:05 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=8b3b5c8eade436fa27713a9b04a942bece21d5dc
The branch, experimental/ac-config-macro-dir-moreargs has been created
at 8b3b5c8eade436fa27713a9b04a942bece21d5dc (commit)
- Log -----------------------------------------------------------------
commit 8b3b5c8eade436fa27713a9b04a942bece21d5dc
Author: Stefano Lattarini <address@hidden>
Date: Wed Jul 4 15:37:46 2012 +0200
aclocal: diagnose non-existing directories in AC_CONFIG_MACRO_DIR better
This new implementation ensures that any directory (possibly excluding
the first one, if the '--install' option is used) that is declared with
AC_CONFIG_MACRO_DIR and that is non-existent will cause an error from
aclocal.
* aclocal.in (scan_m4_dirs): Add a new argument, telling whether it's OK
for the scanned directory to be non-existing. Adjust the implementation
accordingly.
($first_user_m4dir): Remove, no more needed.
(scan_m4_files): Update 'scan_m4_dirs' invocations so that aclocal will
not complain if the first user macro directory is non-existing and the
'--install' option is given: such directory will be created later by
aclocal itself.
* t/aclocal-macrodir.tap: Do not mark the last test as TODO anymore;
it now passes. Make stricter by ensuring a non-existing directory in
AC_CONFIG_MACRO_DIR causes an hard error, not a warning.
Signed-off-by: Stefano Lattarini <address@hidden>
commit e8edece53fd6e71ae3a05a0e266be06ab4f38668
Author: Stefano Lattarini <address@hidden>
Date: Wed Jul 4 15:23:50 2012 +0200
aclocal: multiple local m4 macro dirs with AC_CONFIG_MACRO_DIR
It can be done either passing several arguments to a single invocation:
AC_CONFIG_MACRO_DIR([dir1 dir2])
or issuing more invocations:
AC_CONFIG_MACRO_DIR([dir1])
AC_CONFIG_MACRO_DIR([dir2])
This will allow projects to use several m4 macro local dirs. This is
especially important for projects that are used as nested subpackages
of larger projects.
Autoconf will soon follow suit, with a new macro AC_CONFIG_MACRO_DIRS.
Once that has been implemented in their git repo, we will start to
support it as well.
See also:
<http://lists.gnu.org/archive/html/autoconf/2011-12/msg00037.html>
<http://lists.gnu.org/archive/html/automake-patches/2012-07/msg00010.html>
<http://lists.gnu.org/archive/html/autoconf-patches/2012-07/msg00000.html>
* aclocal.in ($ac_config_macro_dir): Turn this global scalar it into ...
(@ac_config_macro_dirs): ... this global array.
(trace_used_macros): Update '@ac_config_macro_dirs' instead of re-defining
'$ac_config_macro_dir'. Cater to multiple arguments in AC_CONFIG_MACRO_DIR
and to multiple AC_CONFIG_MACRO_DIR invocations.
(main loop): Append '@ac_config_macro_dirs', not '$ac_config_macro_dir',
to '@user_includes'.
* t/aclocal-macrodir.tap: Extend and enhance.
* t/subpkg-macrodir.sh: New test.
* t/list-of-tests.mk: Add it.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
hooks/post-receive
--
GNU Automake
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, experimental/ac-config-macro-dir-moreargs, created. v1.12.1-200-g8b3b5c8,
Stefano Lattarini <=