Assume automake >= 1.10.2.

diff --git a/ChangeLog b/ChangeLog
index 2afae4551d12137543c8a14c13ab8e8483c67f6a..3c9b4da9be5523aa52c1298adfb0057194ee5887 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Bruno Haible  <bruno@clisp.org>
+
+       Assume automake >= 1.10.2.
+       * m4/fixautomake.m4 (FIX_MAKEFILE_COMPILE, FIX_MAKEFILE_INFO): Remove
+       macros.
+
 2009-04-23  Bruno Haible  <bruno@clisp.org>
 
        Fix recognition of "nm" command.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 006272961eb76aa28b84788e67844719c66f3a62..d5fea58e3c391e2925a609e928a9da1820d65659 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Bruno Haible  <bruno@clisp.org>
+
+       Assume automake >= 1.10.2.
+       * configure.ac (AC_CONFIG_FILES): Remove FIX_MAKEFILE_COMPILE
+       invocations.
+
 2009-03-25  Bruno Haible  <bruno@clisp.org>
 
        Fix the handling of Windows resources in shared libraries.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index f58febc426fd4a8e43566b2ec633ffa15502a5c2..017620df5e49395b2032c781612aec9bd8242cc8 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -153,11 +153,9 @@ AC_CONFIG_FILES([intl-java/Makefile])
 
 AC_CONFIG_FILES([intl-csharp/Makefile])
 
-AC_CONFIG_FILES([gnulib-lib/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([gnulib-lib/Makefile])
 
-AC_CONFIG_FILES([src/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/gettext.sh], [chmod a+x src/gettext.sh])
 
 AC_CONFIG_FILES([po/Makefile.in])

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 3b0d06ae7626c16b3bf865fa42db80abdd46278b..949ec64a7b02503124bba4455f1b9ac978557c6f 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Bruno Haible  <bruno@clisp.org>
+
+       Assume automake >= 1.10.2.
+       * configure.ac (AC_CONFIG_FILES): Remove FIX_MAKEFILE_COMPILE,
+       FIX_MAKEFILE_INFO invocations.
+
 2009-04-26  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (VASNPRINTF): Update after the calling convention of

diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index e1940a56703f44ba2433b21fbfc567962ff8a6e8..e7b8046fa2b8e7c15e3c51354d2eb8aefc132dc4 100644 (file)
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -89,8 +89,6 @@ AC_PATH_PROG([DVIPS], [dvips], [$ac_aux_dir_abs/missing dvips])
 AC_PATH_PROG([TEXI2PDF], [texi2pdf], [$ac_aux_dir_abs/missing texi2pdf])
 AC_PATH_PROG([PERL], [perl], [$ac_aux_dir_abs/missing perl])
 
-AC_CONFIG_FILES([Makefile],
-                [FIX_MAKEFILE_COMPILE
-                 FIX_MAKEFILE_INFO])
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index c77b91106a3c8898627795446930e5968c7adf9a..55c468979ee9cbbf4dbc772cf68ac4c54c73eb4a 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Bruno Haible  <bruno@clisp.org>
+
+       Assume automake >= 1.10.2.
+       * configure.ac (AC_CONFIG_FILES): Remove FIX_MAKEFILE_COMPILE,
+       FIX_MAKEFILE_INFO invocations.
+
 2009-04-11  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (gt_GLOBAL_SYMBOL_PIPE): Remove macro, moved to

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 41e03510a09c3929f865fb435b21aaa85f38dcc3..80598b4738323b74f7ef908b3a3c6b92975e75a6 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -354,9 +354,7 @@ AC_CONFIG_SUBDIRS([examples])
 AC_CONFIG_FILES([Makefile])
 
 AC_CONFIG_FILES([doc/Makefile],
-                [FIX_MAKEFILE_COMPILE
-                 FIX_MAKEFILE_DISTRIB
-                 FIX_MAKEFILE_INFO])
+                [FIX_MAKEFILE_DISTRIB])
 
 AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [
   # Change srcdir variable so that it points to ../gettext-runtime/intl.
@@ -366,18 +364,14 @@ AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [
   mv intl/Makefile.tmp intl/Makefile
   ])
 
-AC_CONFIG_FILES([gnulib-lib/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([gnulib-lib/Makefile])
 
-AC_CONFIG_FILES([libgrep/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([libgrep/Makefile])
 
-AC_CONFIG_FILES([src/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/user-email:src/user-email.sh.in])
 
-AC_CONFIG_FILES([libgettextpo/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([libgettextpo/Makefile])
 AC_CONFIG_FILES([libgettextpo/exported.sh])
 
 AC_CONFIG_FILES([po/Makefile.in])
@@ -396,10 +390,8 @@ AC_CONFIG_FILES([man/x-to-1])
 
 AC_CONFIG_FILES([m4/Makefile])
 
-AC_CONFIG_FILES([tests/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([tests/Makefile])
 
-AC_CONFIG_FILES([gnulib-tests/Makefile],
-                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([gnulib-tests/Makefile])
 
 AC_OUTPUT

diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index bf82d7647dc4393210f2d26a0c1a16b957b443b7..927755ac043611ec6b5991f8ff85f1ac0c650f57 100644 (file)
--- 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 7 (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,19 +8,13 @@ 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.10.2 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.10.2 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], [
@@ -30,9 +24,3 @@ AC_DEFUN([FIX_MAKEFILE_TOPDIR_DISTRIB], [
   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
-])