samba: only require libiconv if !BR2_ENABLE_LOCALE

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

diff --git a/package/samba/Config.in b/package/samba/Config.in
index 720ecd795384bfa54bb55e0ed377c8de6bc3238c..a7a0b34df3763b6f2e3b34df79ff55deb99ec5f7 100644 (file)
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SAMBA
        bool "samba"
-       select BR2_PACKAGE_LIBICONV
+       select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        help
          Provides print services to all manner of SMB/CIFS clients,
          including the numerous versions of Microsoft Windows

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 411536302b1af268c1bdfcbebc63ad8a30dd337a..39968a9cb0a9ce3e51f20f4de979b2265d40c14d 100644 (file)
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -16,7 +16,7 @@ SAMBA_INSTALL_TARGET = YES
 
 
 SAMBA_DEPENDENCIES = \
-       libiconv \
+       $(if $(BR2_ENABLE_LOCALE),,libiconv) \
        $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline) \
        $(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),readline) \
        $(if $(BR2_PACKAGE_SAMBA_AVAHI),avahi) \