[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     94395e918948ea1157fa8dfc9491c2f9858711e9
Author:     Michał Bartoszkiewicz <mbartoszkiewicz <AT> gmail <DOT> com>
AuthorDate: Wed Oct  7 23:33:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 23:33:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94395e91

autotools.eclass: support AM_GNU_GETTEXT_REQUIRE_VERSION

gettext 0.19.6 supports AM_GNU_GETTEXT_REQUIRE_VERSION in addition to
AM_GNU_GETTEXT_VERSION.

 eclass/autotools.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index bc4032a..3039a46 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -258,7 +258,7 @@ _at_uses_pkg() {
 }
 _at_uses_autoheader()  { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
 _at_uses_automake()    { _at_uses_pkg AM_INIT_AUTOMAKE; }
-_at_uses_gettext()     { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
+_at_uses_gettext()     { _at_uses_pkg AM_GNU_GETTEXT_{,REQUIRE_}VERSION; }
 _at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
 _at_uses_intltool()    { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; }
 _at_uses_gtkdoc()      { _at_uses_pkg GTK_DOC_CHECK; }
@@ -531,7 +531,7 @@ ALL_AUTOTOOLS_MACROS=(
        AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
        AM_INIT_AUTOMAKE
        AM_GLIB_GNU_GETTEXT
-       AM_GNU_GETTEXT_VERSION
+       AM_GNU_GETTEXT_{,REQUIRE_}VERSION
        {AC,IT}_PROG_INTLTOOL
        GTK_DOC_CHECK
        GNOME_DOC_INIT