From: Bruno Haible <bruno@clisp.org>
Date: Thu, 21 May 2009 22:00:53 +0000 (+0000)
Subject: Support automake 1.11.
X-Git-Tag: v0.18~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df183bc3a458b2f0aa456e7a321b51d2434fceda;p=thirdparty%2Fgettext.git

Support automake 1.11.
---

diff --git a/ChangeLog b/ChangeLog
index 3c9b4da9b..eb8636b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-21  Bruno Haible  <bruno@clisp.org>
+
+	Support automake 1.11.
+	* m4/fixautomake.m4 (FIX_MAKEFILE_TOPDIR_DISTRIB): Update for
+	automake 1.11.
+	* autogen.sh: Update comment.
+
 2009-05-21  Bruno Haible  <bruno@clisp.org>
 
 	Assume automake >= 1.10.2.
diff --git a/autogen.sh b/autogen.sh
index 0354f7e40..e26acb30b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
 # with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.60..2.63 and automake-1.10 in the PATH.
+# This script requires autoconf-2.60..2.63 and automake-1.10..1.11 in the PATH.
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
 #     in a gnulib checkout, or
diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index 927755ac0..989220db1 100644
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,4 +1,4 @@
-# fixautomake.m4 serial 7 (gettext-0.18)
+# fixautomake.m4 serial 8 (gettext-0.18)
 dnl Copyright (C) 2002-2003, 2006, 2009 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -8,17 +8,17 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible
 
-dnl Fix an automake-1.5-1.10.2 bug: the distrib rule is omitted.
+dnl Fix an automake-1.5-1.11 bug: the distrib rule is omitted.
 AC_DEFUN([FIX_MAKEFILE_DISTRIB], [
   sed -e 's,^#distdir:,distdir:,' < $ac_file > $ac_file.tmp
   mv $ac_file.tmp $ac_file
 ])
 
-dnl Fix an automake-1.9-1.10.2 bug: the distrib rule is not extensible.
+dnl Fix an automake-1.9-1.11 bug: the distrib rule is not extensible.
 dnl Insert a invocation of the distdir1 target inside the distdir commands,
 dnl after $(distdir) has been erased and re-created.
 AC_DEFUN([FIX_MAKEFILE_TOPDIR_DISTRIB], [
-  sed_script='/mkdir \$(distdir)$/{a\
+  sed_script='/mkdir "*\$(distdir)"*$/{a\
 \	$(MAKE) distdir1
 }'
   sed -e "$sed_script" < $ac_file > $ac_file.tmp