xbmc: update samba select patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-09-15 08:19:50 +02:00
parent 88f0ba241b
commit 00825fd942
2 changed files with 14 additions and 15 deletions

View File

@ -187,9 +187,9 @@ cd $PKG_BUILD
--disable-ccache \ --disable-ccache \
$XBMC_PULSEAUDIO \ $XBMC_PULSEAUDIO \
--enable-rtmp \ --enable-rtmp \
$XBMC_SAMBA \
$XBMC_NFS \ $XBMC_NFS \
$XBMC_AFP \ $XBMC_AFP \
$XBMC_SAMBA \
--enable-ffmpeg-libvorbis \ --enable-ffmpeg-libvorbis \
--enable-lame \ --enable-lame \
$XBMC_DVDCSS \ $XBMC_DVDCSS \

View File

@ -1,29 +1,28 @@
diff -Naur xbmc-8cb8ae1/configure.in xbmc-8cb8ae1.patch/configure.in 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/configure.in 2011-09-14 19:15:24.254033004 +0200
+++ xbmc-8cb8ae1.patch/configure.in 2011-09-14 19:30:06.249526898 +0200 +++ xbmc-8cb8ae1.patch/configure.in 2011-09-15 07:07:13.269071939 +0200
@@ -111,6 +111,8 @@ @@ -111,6 +111,7 @@
libnfs_disabled="== NFS support disabled. ==" libnfs_disabled="== NFS support disabled. =="
libafpclient_not_found="== Could not find libafpclient. AFP support disabled. ==" libafpclient_not_found="== Could not find libafpclient. AFP support disabled. =="
libafpclient_disabled="== AFP support disabled. ==" libafpclient_disabled="== AFP support disabled. =="
+samba_not_found="== Could not find libsmbclient. SAMBA support disabled. =="
+samba_disabled="== SAMBA support disabled. ==" +samba_disabled="== SAMBA support disabled. =="
alsa_not_found="== Could not find ALSA. ALSA support disabled. ==" alsa_not_found="== Could not find ALSA. ALSA support disabled. =="
dbus_not_found="== Could not find DBUS. DBUS 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=$enableval],
[use_librtmp=auto]) [use_librtmp=auto])
+AC_ARG_ENABLE([samba], +AC_ARG_ENABLE([samba],
+ [AS_HELP_STRING([--disable-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=$enableval],
+ [use_samba=yes]) + [use_samba=yes])
+ +
AC_ARG_ENABLE([nfs], AC_ARG_ENABLE([nfs],
[AS_HELP_STRING([--enable-nfs], [AS_HELP_STRING([--enable-nfs],
[enable NFS support via libnfs (default is auto)])], [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([ssl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([mysqlclient], [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])) 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([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
AC_CHECK_LIB([yajl], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([yajl], [main],, AC_MSG_ERROR($missing_library))
@@ -942,6 +949,18 @@ @@ -942,6 +948,18 @@
AC_MSG_NOTICE($librtmp_disabled) AC_MSG_NOTICE($librtmp_disabled)
fi fi
+# samba +# samba
+if test "$use_samba" = "yes"; then +if test "x$use_samba" != "xno"; then
+ AC_CHECK_LIB([smbclient], [main],, + AC_CHECK_LIB([smbclient], [main],,
+ use_samba=no;AC_MSG_RESULT($samba_not_found)) + use_samba=no;AC_MSG_ERROR($missing_library))
+else +else
+ AC_MSG_RESULT($samba_disabled) + AC_MSG_RESULT($samba_disabled)
+fi +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]) + AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed])
+fi +fi
+ +
# libnfs # libnfs
if test "$use_libnfs" != "no"; then if test "$use_libnfs" != "no"; then
AC_CHECK_HEADERS([nfsc/libnfs.h],, AC_CHECK_HEADERS([nfsc/libnfs.h],,
@@ -1563,6 +1582,12 @@ @@ -1563,6 +1581,12 @@
final_message="$final_message\n libRTMP support:\tNo" final_message="$final_message\n libRTMP support:\tNo"
fi fi
+if test "$use_samba" = "yes"; then +if test "x$use_samba" != "xno"; then
+ final_message="$final_message\n Samba:\tYes" + final_message="$final_message\n libsmbclient support:\tYes"
+else +else
+ final_message="$final_message\n Samba:\tNo" + final_message="$final_message\n libsmbclient support:\tNo"
+fi +fi
+ +
if test "$use_libnfs" != "no"; then if test "$use_libnfs" != "no"; then