From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 28 Dec 2012 18:04:02 +0000 (+0100)
Subject: Merge branch 'am-prog-mkdir-p-remove'
X-Git-Tag: v1.16~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b373ad9963a3d8b0270a93110f900ef7d36c0bd2;p=thirdparty%2Fautomake.git

Merge branch 'am-prog-mkdir-p-remove'

Finally backporting the AM_PROG_MKDIR_P removal that has already taken
place in Automake-NG.  We can safely do this since the latest Gettext
release (1.18.2) has removed all uses of AM_PROG_MKDIR_P, replacing
them with uses of AC_PROG_MKDIR_P instead.

References:
<http://lists.gnu.org/archive/html/bug-gettext/2012-12/msg00064.html>
<http://lists.gnu.org/archive/html/automake/2012-12/msg00024.html>
Commit v0.18.1.1-147-g2cccb4c in the Gettext git repository.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

b373ad9963a3d8b0270a93110f900ef7d36c0bd2
diff --cc automake.in
index 3194c9948,9c0c8b9cc..35aefd329
--- a/automake.in
+++ b/automake.in
@@@ -5129,9 -5128,8 +5129,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,