diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-06-08 18:34:41 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2013-06-10 11:28:22 +0900 |
| commit | 3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a (patch) | |
| tree | 2f6a41c5d904faaaed7b8a5a65ded222f797ab23 /build-aux | |
| parent | 99577a97baf06378f0c4b01b95188f6295fb4633 (diff) | |
| download | external_gettext-3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a.zip external_gettext-3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a.tar.gz external_gettext-3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a.tar.bz2 | |
build: drop the 'fixacocal' auxiliary script
The comments in that script state that its use is only required to
work around issues in aclocal from Automake 1.10, while the rest
of the Gettext build infrastructure assumes Automake >= 1.11 anyway.
* autogen.sh: Drop invocations of 'fixaclocal', simply invoke the
'aclocal' program directly.
* build-aux/fixaclocal: Remove.
* Makefile.am (EXTRA_DIST): Stop distributing it.
(ACLOCAL): Drop redefinition in function of 'fixaclocal'.
* gettext-runtime/Makefile.am (ACLOCAL): Likewise.
* gettext-runtime/libasprintf/Makefile.am (ACLOCAL): Likewise.
* gettext-tools/Makefile.am (ACLOCAL): Likewise.
* gettext-tools/examples/Makefile.am (ACLOCAL): Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/fixaclocal | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/build-aux/fixaclocal b/build-aux/fixaclocal deleted file mode 100755 index 10ff8e4..0000000 --- a/build-aux/fixaclocal +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Script for fixing aclocal.m4 files produced by 'aclocal' from automake 1.10. -# 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 -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Usage: fixaclocal aclocal [OPTIONS] - -"$@" -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' - # (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 - mv aclocal.m4.tmp aclocal.m4 - fi -else - exit $result -fi |