summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-05-15 14:42:02 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-05-20 20:34:29 (GMT)
commit0317b30912eb73bc512b137b1581ff520b14c40a (patch)
tree965affc6c9132279b073af2e013c58bc8724133e
parenta4051d9db88d5cf789d64d973efd0f91fc741f6e (diff)
downloadbuildroot-0317b30912eb73bc512b137b1581ff520b14c40a.tar.gz
buildroot-0317b30912eb73bc512b137b1581ff520b14c40a.tar.bz2
samba: only require libiconv if !BR2_ENABLE_LOCALE
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/samba/Config.in2
-rw-r--r--package/samba/samba.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/samba/Config.in b/package/samba/Config.in
index 720ecd7..a7a0b34 100644
--- 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 4115363..39968a9 100644
--- 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) \