diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-05-15 16:42:02 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-05-20 22:34:29 +0200 |
| commit | 0317b30912eb73bc512b137b1581ff520b14c40a (patch) | |
| tree | 965affc6c9132279b073af2e013c58bc8724133e | |
| parent | a4051d9db88d5cf789d64d973efd0f91fc741f6e (diff) | |
samba: only require libiconv if !BR2_ENABLE_LOCALE
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/samba/Config.in | 2 | ||||
| -rw-r--r-- | package/samba/samba.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/samba/Config.in b/package/samba/Config.in index 720ecd795..a7a0b34df 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 411536302..39968a9cb 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) \ |