diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-12-07 14:58:46 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:15:56 +0200 |
| commit | c23fb7cf3a00b038c20667ec7da8e17fbf46f0f7 (patch) | |
| tree | 44c667600b00ba56413cac4373872609677e8f46 | |
| parent | 2dfecd86d41342c5b33b9912858be24e4be2046d (diff) | |
| download | external_gettext-c23fb7cf3a00b038c20667ec7da8e17fbf46f0f7.zip external_gettext-c23fb7cf3a00b038c20667ec7da8e17fbf46f0f7.tar.gz external_gettext-c23fb7cf3a00b038c20667ec7da8e17fbf46f0f7.tar.bz2 | |
Make it work with automake-1.10.2.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | build-aux/fixaclocal | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -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 9d62bff..10ff8e4 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 |