[bug-gettext] [PATCH] m4: use AC_PROG_MKDIR_P, not the deprecated AM_PROG_MKDIR_P

[Stefano Lattarini]

AM_PROG_MKDIR_P will be deprecated in Automake 1.12.1 and removed
in Automake 1.13.

Signed-off-by: Stefano Lattarini <address@hidden>
---
 gettext-runtime/m4/ChangeLog |    9 +++++++++
 gettext-runtime/m4/intl.m4   |    6 +++---
 gettext-runtime/m4/po.m4     |    6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index ceb1062..991e1d0 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-17  Stefano Lattarini  <address@hidden>  (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 will be deprecated in
+       Automake 1.12.1 and removed in Automake 1.13.
+       Accordingly, bump requirement in AC_PREREQ to 2.60.
+       * po.m4 (AM_PO_SUBDIRS): Likewise.
+
 2012-01-06  Paul Eggert  <address@hidden>
 
        * m4/gettext.m4: In commentary, do not use ` to quote.
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 9b31299..39ed5d2 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-2010 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 <address@hidden>, 1995-2000.
 dnl   Bruno Haible <address@hidden>, 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 47a8342..861c26c 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,4 +1,4 @@
-# po.m4 serial 19 (gettext-0.18.2)
+# po.m4 serial 20 (gettext-0.18.2)
 dnl Copyright (C) 1995-2011 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,14 +17,14 @@ dnl Authors:
 dnl   Ulrich Drepper <address@hidden>, 1995-2000.
 dnl   Bruno Haible <address@hidden>, 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
-- 
1.7.9.5