Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: base-system@g.o, "Michał Bartoszkiewicz" <mbartoszkiewicz@×××××.com>
Subject: [gentoo-dev] [PATCH] autotools.eclass: support AM_GNU_GETTEXT_REQUIRE_VERSION
Date: Tue, 13 Oct 2015 16:26:13
Message-Id: 1444753545-1242-1-git-send-email-mgorny@gentoo.org
1 gettext 0.19.6 supports AM_GNU_GETTEXT_REQUIRE_VERSION in addition to
2 AM_GNU_GETTEXT_VERSION.
3 ---
4 eclass/autotools.eclass | 4 ++--
5 1 file changed, 2 insertions(+), 2 deletions(-)
6
7 // proxying this patch for Michał Bartoszkiewicz
8 // https://github.com/gentoo/gentoo/pull/163
9
10 diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
11 index bc4032a..3039a46 100644
12 --- a/eclass/autotools.eclass
13 +++ b/eclass/autotools.eclass
14 @@ -258,7 +258,7 @@ _at_uses_pkg() {
15 }
16 _at_uses_autoheader() { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
17 _at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; }
18 -_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
19 +_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_{,REQUIRE_}VERSION; }
20 _at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
21 _at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; }
22 _at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; }
23 @@ -531,7 +531,7 @@ ALL_AUTOTOOLS_MACROS=(
24 AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
25 AM_INIT_AUTOMAKE
26 AM_GLIB_GNU_GETTEXT
27 - AM_GNU_GETTEXT_VERSION
28 + AM_GNU_GETTEXT_{,REQUIRE_}VERSION
29 {AC,IT}_PROG_INTLTOOL
30 GTK_DOC_CHECK
31 GNOME_DOC_INIT
32 --
33 2.6.1

Replies