From 53a99d017d6e958997c0fa3e55b98f84b66bbd60 Mon Sep 17 00:00:00 2001
From: jay <jay>
Date: Sat, 25 Nov 2006 17:08:06 +0000
Subject: [PATCH] Define the m4 macro MKINSTALLDIRS ourselves, because
 po/Makefile.in.in needs it but gnulib no longer provides it

---
 ChangeLog           | 11 +++++++++++
 configure.in        |  8 ++++++++
 m4/mkinstalldirs.m4 | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 m4/mkinstalldirs.m4

diff --git a/ChangeLog b/ChangeLog
index 5e2026c..90680be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-25  James Youngman  <jay@gnu.org>
+
+	* doc/textinfo.tex: Removed; we now use the version supplied 
+	by automake.
+	
+	* m4/mkinstalldirs.m4: Added this file.  It's an excerpt from an
+	old version of gnulib's m4/nls.po file.  The current version of
+	gnulib does not expand MKINSTALLDIRS, but gettext-0.14.6's version
+	of po/Makefile.in.in expects it to be expanded.  This m4 file
+	fills the gap.
+
 2006-11-20  James Youngman  <jay@gnu.org>
 
 	* po/et.po, po/bg.po, po/pl.po, po/nl.po, po/tr.po: Updated
diff --git a/configure.in b/configure.in
index 7c0d3bc..9a5a741 100644
--- a/configure.in
+++ b/configure.in
@@ -87,6 +87,14 @@ AC_SYS_LARGEFILE
 
 gl_INIT
 
+
+
+dnl Older versions of gnulib/m4/nls.m4 provide AM_MKINSTALLDIRS.
+dnl The current version of gnulib does not, but the version of 
+dnl po/Makefile.in.in that comes with gettext-0.14.6 expects
+dnl that @MKINSTALLDIRS@ will be expanded.
+AM_MKINSTALLDIRS
+
 dnl lib/regexprops needs to be a native program, because we need to 
 dnl run it in order to generate the documentation about the properties
 dnl of regular expressions.  See lib/Makefile.am.
diff --git a/m4/mkinstalldirs.m4 b/m4/mkinstalldirs.m4
new file mode 100644
index 0000000..1e53ec3
--- /dev/null
+++ b/m4/mkinstalldirs.m4
@@ -0,0 +1,40 @@
+dnl Copyright (C) 1995-2003, 2005,2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+# Originally taken from nls.m4 serial 2 (gettext-0.14.3)
+
+AC_PREREQ(2.50)
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+  dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+  dnl Try to locate it.
+  MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+  AC_SUBST(MKINSTALLDIRS)
+])
-- 
2.11.4.GIT