From c23fb7cf3a00b038c20667ec7da8e17fbf46f0f7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 7 Dec 2008 14:58:46 +0000 Subject: [PATCH] Make it work with automake-1.10.2. --- ChangeLog | 4 ++++ build-aux/fixaclocal | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 593cd4fe3..9a962f09f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-12-07 Bruno Haible + + * build-aux/fixaclocal: Update for automake-1.10.2. + 2008-10-01 Ralf Wildenhues * m4/libtool.m4 (install_override_mode): New LT_DECL. diff --git a/build-aux/fixaclocal b/build-aux/fixaclocal index 9d62bffd9..10ff8e410 100755 --- 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 -- 2.47.2