2 files changed, 8 insertions, 0 deletions
diff --git a/m4/intl.m4 b/m4/intl.m4
index 107883d2..f528e4e6 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -25,7 +25,11 @@ dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
 AC_DEFUN([AM_INTL_SUBDIR],
 [
   AC_REQUIRE([AC_PROG_INSTALL])dnl
+<<<<<<< HEAD
   AC_REQUIRE([AC_PROG_MKDIR])dnl defined by automake
+=======
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+>>>>>>> gawk-4.0-stable
   AC_REQUIRE([AC_PROG_CC])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([gt_GLIBC2])dnl
diff --git a/m4/po.m4 b/m4/po.m4
index 3c9884ba..fe8b0637 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -24,7 +24,11 @@ AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
+<<<<<<< HEAD
   AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+=======
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+>>>>>>> gawk-4.0-stable
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that