util-linux: only needs gettext if locale is selected

Also add missing select in Config.in.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 799833e9b9b09fa4e7167bf786fe00c9c136d3a6..e63814f716f3f13ad65b2ffb275b44673c0bc271 100644 (file)
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_UTIL_LINUX
        bool "util-linux"
        depends on BR2_LARGEFILE
        depends on BR2_USE_WCHAR
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Various useful/essential linux libraries and utilities.
 

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index d8a4e6f3f0a2d720d90d7eed762345df9412255f..c6c8467eefed60e7ffedd0c05e57f6e46ff13d30 100644 (file)
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -35,7 +35,7 @@ else
 UTIL_LINUX_CONF_OPT += --without-ncurses
 endif
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 UTIL_LINUX_DEPENDENCIES += gettext
 UTIL_LINUX_MAKE_OPT += LIBS=-lintl
 endif