aclocal: fix for more-than-once specified directories
authorPavel Raiskup <praiskup@redhat.com>
Mon, 11 Feb 2013 12:11:52 +0000 (13:11 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 21 Feb 2013 14:34:24 +0000 (15:34 +0100)
commit7a3d7cee2b3270443bcd3b91e7e4ada8a1a858a1
tree7ba067741c0b86717b09a11134e250d2f5098d69
parentc83c133556205402d44e81d492efb0b2fe3e3584
aclocal: fix for more-than-once specified directories

Related to automake bug#13514.

Do not consider directories for extra m4 files multiple times in
'aclocal'.  Doing so caused problems on older packages that specify

    configure.ac:  AC_CONFIG_MACRO_DIRS([m4])
    Makefile.am:   ACLOCAL_AMFLAGS = -I m4

if the 'm4' directory does not exist when aclocal is called the first
time by autoreconf.

See:
<http://lists.gnu.org/archive/html/bug-automake/2013-01/msg00115.html>

* aclocal.in (scan_m4_files): Remove duplicates in @user_includes.
* t/aclocal-macrodir.tap: Extend.
* t/aclocal-macrodirs.tap: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
aclocal.in
t/aclocal-macrodir.tap
t/aclocal-macrodirs.tap