quota: use the new gettext logic

This commit switches to use the new gettext logic, which involves:

 - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
   on gettext/host-gettext

 - using TARGET_NLS_LIBS to force linking against libintl

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/quota/Config.in b/package/quota/Config.in
index c8ab0d7ed32986616d43e0f44c0c7cc37a542dd7..051a765570271a7c877394f683885523bc53495f 100644 (file)
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_QUOTA
        depends on BR2_USE_WCHAR
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
        help
          Implementation of the disk quota system.

diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index d3b87552933d4fbd4311ba9852deff0d2ba6b47a..5bd9013d6a36b796750c7d20dac21f4077a4e848 100644 (file)
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -6,18 +6,14 @@
 
 QUOTA_VERSION = 4.01
 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
-QUOTA_DEPENDENCIES = host-gettext
+QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 QUOTA_AUTORECONF = YES
 QUOTA_LICENSE = GPL-2.0+
 QUOTA_CONF_OPTS = --disable-strip-binaries
+QUOTA_LIBS = $(TARGET_NLS_LIBS)
 
 QUOTA_CFLAGS = $(TARGET_CFLAGS)
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-QUOTA_DEPENDENCIES += gettext
-QUOTA_LIBS += -lintl
-endif
-
 ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
 QUOTA_DEPENDENCIES += e2fsprogs
 QUOTA_CONF_OPTS += --enable-ext2direct