Adapt for newer versions of 'aclocal'.

diff --git a/ChangeLog b/ChangeLog
index f4bcfb0485182a08778df1cf5a1c6f95a835e93b..74bf57cfb68729a5b506ff098f99749233b31ca8 100644 (file)
--- 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 943ab30620e376f5aec1e9b8482a0bf8dd3e54e0..9d62bffd96e566a60fd44d5499e87c62fb598b29 100755 (executable)
--- 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