summaryrefslogtreecommitdiffstats
path: root/package/samba/Config.in
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-05-21 20:30:28 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-05-21 20:30:28 +0200
commitc89b725978616a24e066e6b01030bdd3fc0ab5c0 (patch)
treec869c538c6d0b7b7c702ef7c24c4c59a89a973b2 /package/samba/Config.in
parent319a4751c4a3a0209f628a7470a6d8e400d3479d (diff)
parent52e600ebec9cb571edee8f791da851035ae6b969 (diff)
downloadbuildroot-novena-c89b725978616a24e066e6b01030bdd3fc0ab5c0.tar.gz
buildroot-novena-c89b725978616a24e066e6b01030bdd3fc0ab5c0.zip
Merge branch '2010-05-15-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/samba/Config.in')
-rw-r--r--package/samba/Config.in2
1 files changed, 1 insertions, 1 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