From b96e65ba7616570998795274a82ee767912501a1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 21 May 2009 21:08:13 +0000 Subject: Assume automake >= 1.10.2. --- m4/fixautomake.m4 | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'm4') diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4 index bf82d76..927755a 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 -]) -- cgit v1.1