mpd: switch smb support to samba4

samba3 is deprecated upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 5c25445c13c93a8a670b807e4131fd53276f13a4..8ed11490fefc8850d56c57c9f3c95836d8892e32 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -192,11 +192,14 @@ config BR2_PACKAGE_MPD_LIBNFS
 comment "nfs support needs a toolchain w/ RPC"
        depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 
+comment "samba support needs an (e)glibc toolchain"
+       depends on !BR2_TOOLCHAIN_USES_GLIBC
+
 config BR2_PACKAGE_MPD_LIBSMBCLIENT
        bool "samba"
        depends on !BR2_nios2 # samba
-       select BR2_PACKAGE_SAMBA
-       select BR2_PACKAGE_SAMBA_LIBSMBCLIENT
+       depends on BR2_TOOLCHAIN_USES_GLIBC
+       select BR2_PACKAGE_SAMBA4
        help
          Enable Samba support.
 

diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 41f3564ca59e9a606a6141358df65cc38ad4db5e..b5adafd270f423d0cbb00799c368bdbfbf4cd90c 100644 (file)
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -114,7 +114,7 @@ MPD_CONF_OPTS += --disable-nfs
 endif
 
 ifeq ($(BR2_PACKAGE_MPD_LIBSMBCLIENT),y)
-MPD_DEPENDENCIES += samba
+MPD_DEPENDENCIES += samba4
 MPD_CONF_OPTS += --enable-smbclient
 else
 MPD_CONF_OPTS += --disable-smbclient