From: Stefano Lattarini Date: Sat, 8 Jun 2013 16:34:41 +0000 (+0200) Subject: build: drop the 'fixacocal' auxiliary script X-Git-Tag: v0.18.3~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a;p=thirdparty%2Fgettext.git 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 --- diff --git a/ChangeLog b/ChangeLog index 9625a7520..dfc3ddb7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2013-06-08 Stefano Lattarini (tiny change) + + 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. + 2013-06-04 Daiki Ueno Support for Vala. diff --git a/Makefile.am b/Makefile.am index 74e8dae4a..980728884 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,14 +17,13 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies -ACLOCAL = build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = gnulib-local gettext-runtime gettext-tools EXTRA_DIST = \ version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \ - build-aux/ac-help.sed build-aux/fixaclocal build-aux/moopp \ + build-aux/ac-help.sed build-aux/moopp \ m4/fixautomake.m4 m4/woe32-dll.m4 \ m4/libtool.m4 diff --git a/autogen.sh b/autogen.sh index 39285cefb..f55ce5ba9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -337,14 +337,14 @@ else fi (cd gettext-runtime/libasprintf - ../../build-aux/fixaclocal aclocal -I ../../m4 -I ../m4 -I gnulib-m4 + aclocal -I ../../m4 -I ../m4 -I gnulib-m4 autoconf autoheader && touch config.h.in automake --add-missing --copy ) (cd gettext-runtime - ../build-aux/fixaclocal aclocal -I m4 -I ../m4 -I gnulib-m4 + aclocal -I m4 -I ../m4 -I gnulib-m4 autoconf autoheader && touch config.h.in automake --add-missing --copy @@ -361,7 +361,7 @@ fi cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS (cd gettext-tools/examples - ../../build-aux/fixaclocal aclocal -I ../../gettext-runtime/m4 -I ../../m4 + aclocal -I ../../gettext-runtime/m4 -I ../../m4 autoconf automake --add-missing --copy # Rebuilding the examples PO files is only rarely needed. @@ -371,7 +371,7 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS ) (cd gettext-tools - ../build-aux/fixaclocal aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 + aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 autoconf autoheader && touch config.h.in test -d intl || mkdir intl @@ -392,6 +392,6 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS fi ) -build-aux/fixaclocal aclocal -I m4 +aclocal -I m4 autoconf automake diff --git a/build-aux/fixaclocal b/build-aux/fixaclocal deleted file mode 100755 index 10ff8e410..000000000 --- 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 . - -# 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 diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index df5336fcf..bd8fefc11 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -17,7 +17,6 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies -ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnulib-m4 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@ diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am index 343ae4bd2..8e876c8ac 100644 --- a/gettext-runtime/libasprintf/Makefile.am +++ b/gettext-runtime/libasprintf/Makefile.am @@ -17,7 +17,6 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies -ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4 -I gnulib-m4 EXTRA_DIST = BUILT_SOURCES = diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 3715b8a3c..e93ab1ff0 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -17,7 +17,6 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies -ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am index f4e93cb06..1a73bda44 100644 --- a/gettext-tools/examples/Makefile.am +++ b/gettext-tools/examples/Makefile.am @@ -17,7 +17,6 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.2 foreign -ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I ../../gettext-runtime/m4 -I ../../m4 SUBDIRS = po EXTRA_DIST =