From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 15 Nov 2012 15:40:46 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b64c1f41633729250d2b7184359b673f17ce29b2;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  fixup: Automake installation works again
  tests: AC_CONFIG_MACRO_DIRS: ignore inevitable failures with old autoconf
  recursion: remove _AM_EXTRA_RECURSIVE_TARGETS indirection
  aclocal: AC_CONFIG_MACRO_DIRS: work around autom4te option parsing bugs
  aclocal: tracing AC_CONFIG_MACRO_DIRS can work with older autoconf as well
  news: we trace AC_CONFIG_MACRO_DIRS
  news: improve wording
  aclocal: trace AC_CONFIG_MACRO_DIR_TRACE
  aclocal: avoid spurious warnings from autom4te with AC_CONFIG_MACRO_DIRS
  coverage: expose a bug in aclocal (spurious warnings)
  aclocal: smash newlines in arguments of traced macros
  tests: better coverage for AC_CONFIG_MACRO_DIRS
  aclocal: diagnose non-existing directories in AC_CONFIG_MACRO_DIRS better
  aclocal: multiple local m4 macro dirs with AC_CONFIG_MACRO_DIRS
---

b64c1f41633729250d2b7184359b673f17ce29b2
diff --cc aclocal.in
index cb50e429f,76b556a6b..1098f637a
--- a/aclocal.in
+++ b/aclocal.in
@@@ -44,6 -45,19 +44,16 @@@ use File::Path ()
  
  # Some globals.
  
+ # Support AC_CONFIG_MACRO_DIRS also with older autoconf.
+ # FIXME: To be removed in Automake 1.14, once we can assume autoconf
+ #        2.70 or later.
+ # FIXME: keep in sync with 'internal/ac-config-macro-dirs.m4'.
+ my $ac_config_macro_dirs_fallback =
+   'm4_ifndef([AC_CONFIG_MACRO_DIRS], [' .
+     'm4_defun([_AM_CONFIG_MACRO_DIRS], [])' .
+     'm4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])' .
+   '])';
+ 
 -# We do not operate in threaded mode.
 -$perl_threads = 0;
 -
  # Include paths for searching macros.  We search macros in this order:
  # user-supplied directories first, then the directory containing the
  # automake macros, and finally the system-wide directories for
diff --cc automake.in
index 660685398,3a401d8ef..1b4d37576
--- a/automake.in
+++ b/automake.in
@@@ -4174,8 -5128,9 +4174,8 @@@ sub scan_autoconf_traces ($
  		AC_REQUIRE_AUX_FILE => 1,
  		AC_SUBST_TRACE => 1,
  		AM_AUTOMAKE_VERSION => 1,
 -                AM_PROG_MKDIR_P => 0, # FIXME: to be removed in 1.14
  		AM_CONDITIONAL => 2,
- 		_AM_EXTRA_RECURSIVE_TARGETS => 1,
+ 		AM_EXTRA_RECURSIVE_TARGETS => 1,
  		AM_GNU_GETTEXT => 0,
  		AM_GNU_GETTEXT_INTL_SUBDIR => 0,
  		AM_INIT_AUTOMAKE => 0,