From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 21 Feb 2013 14:35:04 +0000 (+0100)
Subject: Merge branch 'fix-pr13514' into branch-1.13.2
X-Git-Tag: v1.13.1d~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8933e87ca570f3e710559b12cddad4473525c19;p=thirdparty%2Fautomake.git

Merge branch 'fix-pr13514' into branch-1.13.2

* fix-pr13514:
  aclocal: fix for more-than-once specified directories
  aclocal: just warn if the primary local m4 dir doesn't exist (don't error)
---

a8933e87ca570f3e710559b12cddad4473525c19
diff --cc t/aclocal-macrodirs.tap
index ac594bb6a,0deae7236..0898c29ef
--- a/t/aclocal-macrodirs.tap
+++ b/t/aclocal-macrodirs.tap
@@@ -371,9 -380,29 +380,29 @@@ not $ACLOCAL -Wnone --install 2>stderr 
  test_end
  
  #---------------------------------------------------------------------------
+ 
+ test_begin "AC_CONFIG_MACRO_DIRS([not-exist]) and ACLOCAL_AMFLAGS = -I not-exist"
+ 
+ cat > configure.ac << 'END'
+ AC_INIT([oops], [1.0])
+ AC_CONFIG_MACRO_DIRS([not-exist])
+ END
+ 
+ cat > Makefile.am << 'END'
+ ACLOCAL_AMFLAGS = -I not-exist
+ END
+ 
+ $ACLOCAL -Wno-error 2>stderr \
+   && cat stderr >&2 \
+   && test $(grep -c "couldn't open directory 'not-exist'" stderr) -eq 1 \
+   || r='not ok'
+ 
+ test_end
+ 
+ #---------------------------------------------------------------------------
  
  # Avoid spurious failures with pre-2.70 autoconf.
 -# FIXME: remove this in automake 1.14, once we require Autoconf 2.70.
 +# FIXME: remove this in automake 2.0, once we require Autoconf 2.70.
  if echo 'AC_INIT AC_CONFIG_MACRO_DIRS' | $AUTOCONF -o/dev/null -; then
  
    test_begin "AC_CONFIG_MACRO_DIRS interaction with AC_REQUIRE"