summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-10-17 13:36:27 +0200
committerMichał Górny <mgorny@gentoo.org>2015-10-17 13:37:52 +0200
commit0b3fad1566b92ebbbb5e0e66a63337f3075cd483 (patch)
treed18dea6092a16c8f7f7d0b3f216266729c841547
parentsci-calculators/units: Version bump. (diff)
parentautotools.eclass: support AM_GNU_GETTEXT_REQUIRE_VERSION (diff)
downloadgentoo-0b3fad1566b92ebbbb5e0e66a63337f3075cd483.tar.gz
gentoo-0b3fad1566b92ebbbb5e0e66a63337f3075cd483.tar.bz2
gentoo-0b3fad1566b92ebbbb5e0e66a63337f3075cd483.zip
autotools.eclass: Merge "support AM_GNU_GETTEXT_REQUIRE_VERSION"
Pull-Request: https://github.com/gentoo/gentoo/pull/163 Review: https://archives.gentoo.org/gentoo-dev/message/2ecced7c5f8dc93e49ff69abd00212eb
-rw-r--r--eclass/autotools.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index bc4032a35136..3039a466b91f 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