From 0dd519e0b8c7bb7e4118c094f03c22caa96e40ea Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 16 Jan 2012 12:34:13 +0100
Subject: [PATCH] samba: make build with libiconv optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/samba/build | 6 +++++-
 packages/network/samba/meta  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/network/samba/build b/packages/network/samba/build
index 4e768e1641..c4b5f0ec52 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -26,6 +26,10 @@
   strip_lto
   strip_gold
 
+if [ "$ICONV" = "libiconv" ]; then
+  CONFIG_SAMBA="--with-libiconv=$SYSROOT_PREFIX/usr"
+fi
+
 if [ "$AVAHI_DAEMON" = yes ]; then
   SMB_AVAHI="--enable-avahi"
 else
@@ -102,7 +106,7 @@ sh autogen.sh
             --with-static-modules=charset_CP437,charset_CP850 \
             --with-included-popt \
             --with-included-iniparser \
-            --with-libiconv=$SYSROOT_PREFIX/usr \
+            $CONFIG_SAMBA \
             --with-sqlite3 \
             --with-pthreads \
             --without-setproctitle \
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index b5d3d76150..5cf0789154 100644
--- a/packages/network/samba/meta
+++ b/packages/network/samba/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.samba.org"
 PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="libiconv sqlite connman"
-PKG_BUILD_DEPENDS="toolchain libiconv sqlite"
+PKG_DEPENDS="$ICONV sqlite connman"
+PKG_BUILD_DEPENDS="toolchain $ICONV sqlite"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client"