From: Bruno Haible <bruno@clisp.org>
Date: Sun, 21 Sep 2008 13:58:22 +0000 (+0000)
Subject: Adapt for newer versions of 'aclocal'.
X-Git-Tag: v0.18~335
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c5378865ea3f8c479adaeb09c6949f31b6fc887;p=thirdparty%2Fgettext.git

Adapt for newer versions of 'aclocal'.
---

diff --git a/ChangeLog b/ChangeLog
index f4bcfb048..74bf57cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-21  Bruno Haible  <bruno@clisp.org>
+
+	* build-aux/fixaclocal: Adapt for newer versions of 'aclocal'.
+
 2008-09-14  Bruno Haible  <bruno@clisp.org>
 
 	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC,
diff --git a/build-aux/fixaclocal b/build-aux/fixaclocal
index 943ab3062..9d62bffd9 100755
--- a/build-aux/fixaclocal
+++ b/build-aux/fixaclocal
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Script for fixing aclocal.m4 files produced by 'aclocal' from automake 1.10.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,8 +20,9 @@
 "$@"
 result=$?
 if test $result = 0 && test -f aclocal.m4; then
-  # Remove the block of 4 lines starting with 'm4_if(m4_PACKAGE_VERSION'.
-  sed -e '/m4_if(m4_PACKAGE_VERSION/{N;N;N;d}' < aclocal.m4 > aclocal.m4.tmp
+  # Remove the block of 4 lines starting with 'm4_if(m4_PACKAGE_VERSION'
+  # and the block of 5 lines starting with 'm4_if(AC_AUTOCONF_VERSION'.
+  sed -e '/m4_if(m4_PACKAGE_VERSION/{N;N;N;d}' -e '/m4_if(AC_AUTOCONF_VERSION/{N;N;N;N;d}' < aclocal.m4 > aclocal.m4.tmp
   if cmp aclocal.m4 aclocal.m4.tmp > /dev/null; then
     rm -f aclocal.m4.tmp
   else