From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 28 Apr 2012 12:01:58 +0000 (+0200)
Subject: m4: use AC_PROG_MKDIR_P, not the deprecated AM_PROG_MKDIR_P
X-Git-Tag: v0.18.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cccb4c6620a2e80706320933730b86d4fef959a;p=thirdparty%2Fgettext.git

m4: use AC_PROG_MKDIR_P, not the deprecated AM_PROG_MKDIR_P

AM_PROG_MKDIR_P is be deprecated since Automake 1.12.1, and will
be removed in Automake 1.14.

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

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 3981bbbe9..f47bb696b 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-07  Stefano Lattarini  <stefano.lattarini@gmailcom>  (tiny change)
+
+	m4: use AC_PROG_MKDIR_P, not the deprecated AM_PROG_MKDIR_P
+	* gettext.m4 (AM_INTL_SUBDIR): Require AC_PROG_MKDIR_P instead
+	of AM_PROG_MKDIR_P, as this latter macro is deprecated since
+	Automake 1.12.1, and will be removed in Automake 1.14.
+	Accordingly, bump requirement in AC_PREREQ to 2.60.
+	* po.m4 (AM_PO_SUBDIRS): Likewise.
+
 2012-06-22  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.m4: Write "Mac OS X" instead of "MacOS X".
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 0cf051e17..97b03165a 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 21 (gettext-0.18.2)
+# intl.m4 serial 22 (gettext-0.18.2)
 dnl Copyright (C) 1995-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2009.
 
-AC_PREREQ([2.53])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the intl subdirectory,
 dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
@@ -25,7 +25,7 @@ dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
 AC_DEFUN([AM_INTL_SUBDIR],
 [
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
   AC_REQUIRE([AC_PROG_CC])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([gt_GLIBC2])dnl
diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index 616e3cb89..32411171f 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -17,14 +17,14 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that