Make it work with automake-1.10.2.

diff --git a/ChangeLog b/ChangeLog
index 593cd4fe37f7742f1e47be1a921229cd84dcdfd2..9a962f09fcca7c74aa4e9aa61b4a7e042ee14ce5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-07  Bruno Haible  <bruno@clisp.org>
+
+       * build-aux/fixaclocal: Update for automake-1.10.2.
+
 2008-10-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * m4/libtool.m4 (install_override_mode): New LT_DECL.

diff --git a/build-aux/fixaclocal b/build-aux/fixaclocal
index 9d62bffd96e566a60fd44d5499e87c62fb598b29..10ff8e4105331b650ea1b14b657b4db206003666 100755 (executable)
--- a/build-aux/fixaclocal
+++ b/build-aux/fixaclocal
@@ -21,8 +21,10 @@
 result=$?
 if test $result = 0 && test -f aclocal.m4; then
   # 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
+  # and the block of 5 lines starting with 'm4_if(AC_AUTOCONF_VERSION'
+  # (automake <= 1.10.1) or with 'm4_if(m4_defn([AC_AUTOCONF_VERSION])'
+  # (automake >= 1.10.2).
+  sed -e '/m4_if(m4_PACKAGE_VERSION/{N;N;N;d}' -e '/m4_if(AC_AUTOCONF_VERSION/{N;N;N;N;d}' -e '/m4_if(m4_defn(\[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