From 7f79dfb06243f4b0309817166bca54b44a6bc6f4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 28 May 2013 16:16:12 +0200
Subject: [PATCH] Revert "samba: build libsmbclient as shared lib"

This reverts commit 04dcb1c43e5a9223a578a01e8ebd13b4b2aa0649.
---
 packages/mediacenter/xbmc/build |  1 +
 packages/network/samba/build    | 11 ++++++++---
 packages/network/samba/install  |  3 ---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 3b19c95d53..33870f44f8 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -178,6 +178,7 @@ fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   XBMC_SAMBA="--enable-samba"
+  export LIBS="$LIBS -ltalloc -ltdb -lwbclient"
 else
   XBMC_SAMBA="--disable-samba"
 fi
diff --git a/packages/network/samba/build b/packages/network/samba/build
index 79b79bce2f..c909fb180b 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -22,6 +22,8 @@
 
 . config/options $1
 
+CFLAGS="$CFLAGS -fPIC -DPIC"
+
 cd $PKG_BUILD/source3
 
 sh autogen.sh
@@ -55,7 +57,7 @@ samba_cv_have_setresuid=yes \
             --with-piddir=/var/run \
             --enable-shared \
             --disable-static \
-            --enable-shared-libs \
+            --disable-shared-libs \
             --disable-debug \
             --with-libiconv="$SYSROOT_PREFIX/usr" \
             --disable-krb5developer \
@@ -115,14 +117,17 @@ samba_cv_have_setresuid=yes \
             --without-sqlite3 \
             --without-setproctitle \
 
-make bin/libsmbclient.so
+make bin/libtalloc.a
+make bin/libwbclient.a
+make bin/libtdb.a
+make bin/libsmbclient.a
 
 if [ "$SAMBA_SERVER" = "yes" ]; then
   make bin/samba_multicall
 fi
 
 mkdir -p $SYSROOT_PREFIX/usr/lib
-  cp -P bin/*.so* $SYSROOT_PREFIX/usr/lib
+  cp -P bin/*.a $SYSROOT_PREFIX/usr/lib
 
 mkdir -p $SYSROOT_PREFIX/usr/include
   cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 5a175ed94f..ca9d740cf9 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -22,9 +22,6 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/source3/bin/*.so* $INSTALL/usr/lib
-
 if [ "$SAMBA_SERVER" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/source3/bin/samba_multicall $INSTALL/usr/bin