From 5add8f45dc8a6fa0ffb7161d31cbb9b8be04d94e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 12:35:08 +0200 Subject: [PATCH] samba4: 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. Signed-off-by: Thomas Petazzoni --- package/samba4/samba4.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 93c45daa58..86546e975b 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -15,7 +15,8 @@ SAMBA4_DEPENDENCIES = \ e2fsprogs popt python zlib \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ - $(if $(BR2_PACKAGE_READLINE),readline) + $(if $(BR2_PACKAGE_READLINE),readline) \ + $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_ACL),y) SAMBA4_CONF_OPTS += --with-acl-support @@ -46,12 +47,6 @@ else SAMBA4_CONF_OPTS += --without-fam endif -ifeq ($(BR2_PACKAGE_GETTEXT),y) -SAMBA4_DEPENDENCIES += gettext -else -SAMBA4_CONF_OPTS += --without-gettext -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) SAMBA4_CONF_OPTS += --enable-gnutls SAMBA4_DEPENDENCIES += gnutls -- 2.30.2