From b96e65ba7616570998795274a82ee767912501a1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 21 May 2009 21:08:13 +0000 Subject: [PATCH] Assume automake >= 1.10.2. --- ChangeLog | 6 ++++++ gettext-runtime/ChangeLog | 6 ++++++ gettext-runtime/configure.ac | 6 ++---- gettext-runtime/libasprintf/ChangeLog | 6 ++++++ gettext-runtime/libasprintf/configure.ac | 4 +--- gettext-tools/ChangeLog | 6 ++++++ gettext-tools/configure.ac | 22 +++++++--------------- m4/fixautomake.m4 | 20 ++++---------------- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2afae4551..3c9b4da9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-05-21 Bruno Haible + + Assume automake >= 1.10.2. + * m4/fixautomake.m4 (FIX_MAKEFILE_COMPILE, FIX_MAKEFILE_INFO): Remove + macros. + 2009-04-23 Bruno Haible Fix recognition of "nm" command. diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 006272961..d5fea58e3 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,9 @@ +2009-05-21 Bruno Haible + + Assume automake >= 1.10.2. + * configure.ac (AC_CONFIG_FILES): Remove FIX_MAKEFILE_COMPILE + invocations. + 2009-03-25 Bruno Haible Fix the handling of Windows resources in shared libraries. diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index f58febc42..017620df5 100644 --- 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 3b0d06ae7..949ec64a7 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,9 @@ +2009-05-21 Bruno Haible + + Assume automake >= 1.10.2. + * configure.ac (AC_CONFIG_FILES): Remove FIX_MAKEFILE_COMPILE, + FIX_MAKEFILE_INFO invocations. + 2009-04-26 Bruno Haible * vasnprintf.c (VASNPRINTF): Update after the calling convention of diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac index e1940a567..e7b8046fa 100644 --- 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 c77b91106..55c468979 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,9 @@ +2009-05-21 Bruno Haible + + Assume automake >= 1.10.2. + * configure.ac (AC_CONFIG_FILES): Remove FIX_MAKEFILE_COMPILE, + FIX_MAKEFILE_INFO invocations. + 2009-04-11 Bruno Haible * configure.ac (gt_GLOBAL_SYMBOL_PIPE): Remove macro, moved to diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 41e03510a..80598b473 100644 --- 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 bf82d7647..927755ac0 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 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 -]) -- 2.47.3