Add support for automake 1.11.

3 files changed, 12 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b5f25d..199d335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Bruno Haible  <bruno@clisp.org>
+
+	Add support for automake 1.11.
+	* m4/fixautomake.m4: Update from GNU gettext.
+	* autogen.sh: Update comment.
+
 2009-05-10  Bruno Haible  <bruno@clisp.org>
 
 	* doc/unictype.texi (Mirrored character): Fix typo.
diff --git a/autogen.sh b/autogen.sh
index 30426c5..eeade55 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.63 and automake-1.10 in the PATH.
+# This script requires autoconf-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 bf82d76..989220d 100644
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,5 +1,5 @@
-# fixautomake.m4 serial 6 (gettext-0.16)
-dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
+# 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
 dnl Public License, this file may be distributed as part of a program
@@ -8,31 +8,19 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible
 
-dnl Fix unesthetic build commands generated by automake.
-AC_DEFUN([FIX_MAKEFILE_COMPILE], [
-  sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $ac_file > $ac_file.tmp
-  mv $ac_file.tmp $ac_file
-])
-
-dnl Fix an automake-1.5-1.7.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 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
   mv $ac_file.tmp $ac_file
 ])
-
-dnl Fix an automake-1.5-1.7.2 bug: all info files are erased by "make".
-AC_DEFUN([FIX_MAKEFILE_INFO], [
-  sed -e '/@rm -f \$''@/d' < $ac_file > $ac_file.tmp
-  mv $ac_file.tmp $ac_file
-])