diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-10-13 21:29:33 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-10-13 21:29:33 +0200 |
| commit | 151fc88916ca2d6fb1fc3b945dbd8912ff162c94 (patch) | |
| tree | d00650ee42daf5230d03a5e419664695c396ab02 /m4 | |
| parent | fb5a67778f7eeb008a515988d336ae078e5e6121 (diff) | |
| parent | d45f10d95061489b135987cc3168207d0ed4aa7b (diff) | |
| download | egawk-151fc88916ca2d6fb1fc3b945dbd8912ff162c94.tar.gz egawk-151fc88916ca2d6fb1fc3b945dbd8912ff162c94.tar.bz2 egawk-151fc88916ca2d6fb1fc3b945dbd8912ff162c94.zip | |
Merge branch 'gawk-4.0-stable'
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/intl.m4 | 4 | ||||
| -rw-r--r-- | m4/po.m4 | 4 |
2 files changed, 8 insertions, 0 deletions
@@ -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 @@ -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 |