From 00825fd9421858a26e37db449d39fb83449ca638 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 15 Sep 2011 08:19:50 +0200
Subject: [PATCH] xbmc: update samba select patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/build               |  2 +-
 ...mc-8cb8ae1-203-let_select_Samba-0.2.patch} | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename packages/mediacenter/xbmc/patches/{xbmc-8cb8ae1-203-let_select_Samba-0.1.patch => xbmc-8cb8ae1-203-let_select_Samba-0.2.patch} (88%)

diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 2b4a910198..c0da5b8ca7 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -187,9 +187,9 @@ cd $PKG_BUILD
             --disable-ccache \
             $XBMC_PULSEAUDIO \
             --enable-rtmp \
+            $XBMC_SAMBA \
             $XBMC_NFS \
             $XBMC_AFP \
-            $XBMC_SAMBA \
             --enable-ffmpeg-libvorbis \
             --enable-lame \
             $XBMC_DVDCSS \
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.2.patch
similarity index 88%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.2.patch
index 6cd5524926..1d741ce561 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.2.patch
@@ -1,29 +1,28 @@
 diff -Naur xbmc-8cb8ae1/configure.in xbmc-8cb8ae1.patch/configure.in
 --- xbmc-8cb8ae1/configure.in	2011-09-14 19:15:24.254033004 +0200
-+++ xbmc-8cb8ae1.patch/configure.in	2011-09-14 19:30:06.249526898 +0200
-@@ -111,6 +111,8 @@
++++ xbmc-8cb8ae1.patch/configure.in	2011-09-15 07:07:13.269071939 +0200
+@@ -111,6 +111,7 @@
  libnfs_disabled="== NFS support disabled. =="
  libafpclient_not_found="== Could not find libafpclient. AFP support disabled. =="
  libafpclient_disabled="== AFP support disabled. =="
-+samba_not_found="== Could not find libsmbclient. SAMBA support disabled. =="
 +samba_disabled="== SAMBA support disabled. =="
  alsa_not_found="== Could not find ALSA. ALSA support disabled. =="
  dbus_not_found="== Could not find DBUS. DBUS support disabled. =="
  
-@@ -270,6 +272,12 @@
+@@ -270,6 +271,12 @@
    [use_librtmp=$enableval],
    [use_librtmp=auto])
  
 +AC_ARG_ENABLE([samba],
 +  [AS_HELP_STRING([--disable-samba],
-+  [disable SAMBA support (default is enabled if libsmbclient is found)])],
++  [disable SAMBA support (default is enabled)])],
 +  [use_samba=$enableval],
 +  [use_samba=yes])
 +
  AC_ARG_ENABLE([nfs],
    [AS_HELP_STRING([--enable-nfs],
    [enable NFS support via libnfs (default is auto)])],
-@@ -655,7 +663,6 @@
+@@ -655,7 +662,6 @@
  AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
  AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
  AC_CHECK_LIB([ssh],         [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
@@ -31,33 +30,33 @@ diff -Naur xbmc-8cb8ae1/configure.in xbmc-8cb8ae1.patch/configure.in
  AC_CHECK_LIB([bluetooth],   [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
  AC_CHECK_LIB([yajl],        [main],, AC_MSG_ERROR($missing_library))
  
-@@ -942,6 +949,18 @@
+@@ -942,6 +948,18 @@
    AC_MSG_NOTICE($librtmp_disabled)
  fi
  
 +# samba
-+if test "$use_samba" = "yes"; then
++if test "x$use_samba" != "xno"; then
 +  AC_CHECK_LIB([smbclient], [main],,
-+    use_samba=no;AC_MSG_RESULT($samba_not_found))
++    use_samba=no;AC_MSG_ERROR($missing_library))
 +else
 +  AC_MSG_RESULT($samba_disabled)
 +fi
 +
-+if test "$use_samba" = "yes"; then
++if test "x$use_samba" != "xno"; then
 +  AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed])
 +fi
 +
  # libnfs
  if test "$use_libnfs" != "no"; then
    AC_CHECK_HEADERS([nfsc/libnfs.h],,
-@@ -1563,6 +1582,12 @@
+@@ -1563,6 +1581,12 @@
    final_message="$final_message\n  libRTMP support:\tNo"
  fi
  
-+if test "$use_samba" = "yes"; then
-+  final_message="$final_message\n  Samba:\tYes"
++if test "x$use_samba" != "xno"; then
++  final_message="$final_message\n  libsmbclient support:\tYes"
 +else
-+  final_message="$final_message\n  Samba:\tNo"
++  final_message="$final_message\n  libsmbclient support:\tNo"
 +fi
 +
  if test "$use_libnfs" != "no"; then