From 34763b5dee9d09bc1315469dcb803afbb19f5037 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 19 Jun 2012 19:24:56 +0200
Subject: [PATCH] samba: cleanup, build with shared zlib

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

diff --git a/packages/network/samba/build b/packages/network/samba/build
index 76e239faad..98a0da0136 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -49,8 +49,6 @@ samba_cv_USE_SETREUID=yes \
 samba_cv_USE_SETRESUID=yes \
 samba_cv_have_setreuid=yes \
 samba_cv_have_setresuid=yes \
-ac_cv_header_zlib_h=no \
-samba_cv_zlib_1_2_3=no \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -63,8 +61,8 @@ samba_cv_zlib_1_2_3=no \
             --with-logfilebase=/var/log \
             --with-nmbdsocketdir=/var/nmbd \
             --with-piddir=/var/run \
-            --disable-shared \
-            --enable-static \
+            --enable-shared \
+            --disable-static \
             --disable-shared-libs \
             --disable-debug \
             --with-libiconv="$SYSROOT_PREFIX/usr" \
@@ -79,9 +77,6 @@ samba_cv_zlib_1_2_3=no \
             --disable-iprint \
             --disable-pie \
             --disable-relro \
-            --disable-shared-libs \
-            --disable-external-libtalloc \
-            --disable-external-libtdb \
             --disable-fam \
             --disable-dnssd \
             $SMB_AVAHI \
@@ -91,7 +86,9 @@ samba_cv_zlib_1_2_3=no \
             --disable-dmalloc \
             --with-fhs \
             --without-libtalloc \
+            --disable-external-libtalloc \
             --without-libtdb \
+            --disable-external-libtdb \
             --without-libnetapi \
             --with-libsmbclient \
             --without-libsmbsharemodes \
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index cbed6391a9..44b13a3271 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="$ICONV connman"
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_DEPENDS="$ICONV zlib connman"
+PKG_BUILD_DEPENDS="toolchain zlib $ICONV"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client"