From 8e39b0161d081e5a6afdb36dd77d7312d9cc62f4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 10 Feb 2011 12:27:43 +0100
Subject: [PATCH] samba: add libiconv support, add some more options

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

diff --git a/packages/network/samba/build b/packages/network/samba/build
index bee748948f..4faab101be 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -43,38 +43,65 @@ sh autogen.sh
             --with-privatedir=/var/run \
             --enable-shared \
             --disable-static \
-            --enable-shared-libs \
             --enable-debug \
+            --disable-krb5developer \
+            --disable-picky-developer \
+            --enable-largefile \
+            --disable-socket-wrapper \
+            --disable-nss-wrapper \
             --disable-swat \
             --disable-cups \
             --disable-iprint \
-            --with-fhs \
             --enable-pie \
-            --with-pthreads \
-            --with-sqlite3 \
             --enable-relro \
+            --enable-shared-libs \
+            --enable-external-libtalloc \
+            --disable-external-libtdb \
+            --disable-fam \
             --disable-dnssd \
             $SMB_AVAHI \
-            --without-pam \
-            --without-ads \
+            --disable-pthreadpool \
+            --enable-gnutls \
+            --disable-netapi \
+            --disable-dmalloc \
+            --with-fhs \
             --with-libtalloc \
             --without-libtdb \
             --without-libnetapi \
-            --with-cifsmount \
-            --with-cifsumount \
-            --without-ldap \
-            --without-acl-support \
-            --with-winbind \
-            --with-dnsupdate \
-            --without-automount \
-            --with-included-popt \
             --with-libsmbclient \
             --with-libsmbsharemodes \
+            --without-libaddns \
+            --without-afs \
+            --without-fake-kaserver \
+            --without-vfs-afsacl \
+            --without-dce-dfs \
+            --without-ldap \
+            --without-ads \
+            --with-dnsupdate \
+            --without-automount \
+            --with-cifsmount \
+            --without-cifsumount \
+            --without-cifsupcall \
+            --without-pam \
+            --without-pam_smbpass \
+            --without-nisplus-home \
+            --with-syslog \
             --without-quotas \
             --without-sys-quotas \
-            --with-syslog \
             --without-utmp \
+            --without-cluster-support \
+            --without-acl-support \
+            --without-aio-support \
             --with-sendfile-support \
+            --without-wbclient \
+            --with-winbind \
+            --with-static-modules=charset_CP437,charset_CP850 \
+            --with-included-popt \
+            --with-included-iniparser \
+            --with-libiconv=$SYSROOT_PREFIX/usr \
+            --with-sqlite3 \
+            --with-pthreads \
+            --without-setproctitle \
 
 make bin/libsmbclient.so
 make bin/mount.cifs
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index 209499cf1c..bb8bb4822d 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="sqlite talloc connman"
-PKG_BUILD_DEPENDS="toolchain sqlite talloc"
+PKG_DEPENDS="libiconv sqlite talloc connman"
+PKG_BUILD_DEPENDS="toolchain libiconv sqlite talloc"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client"