mpd: add support for libupnp18

Instead of selecting BR2_PACKAGE_LIBUPNP, select BR2_PACKAGE_LIBUPNP18
if BR2_PACKAGE_LIBUPNP is not enabled

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 5991b6f4bb434924492d3d3773db01390d2c1b3f..bad32f84405c3802e53b04669dbe717e7617ca85 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -309,7 +309,7 @@ config BR2_PACKAGE_MPD_TCP
 config BR2_PACKAGE_MPD_UPNP
        bool "UPnP"
        select BR2_PACKAGE_EXPAT
-       select BR2_PACKAGE_LIBUPNP
+       select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP
        help
          Enable MPD UPnP client support.
 

diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 26e82af0a863c48f4e1c576f492e47f4e77a6c4a..f50e3d90c7e60359a64ee59ef84adba476e6855b 100644 (file)
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -236,7 +236,9 @@ MPD_CONF_OPTS += --disable-twolame-encoder
 endif
 
 ifeq ($(BR2_PACKAGE_MPD_UPNP),y)
-MPD_DEPENDENCIES += expat libupnp
+MPD_DEPENDENCIES += \
+       expat \
+       $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
 MPD_CONF_OPTS += --enable-upnp
 else
 MPD_CONF_OPTS += --disable-upnp