summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-03-11 10:33:58 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-04-02 00:45:39 +0200
commit252218881b1e807ca4d625f457675f01d1158f99 (patch)
treea1955dc79fd3228547f1e01ae38acbce7346be5c
parentcc22fb65c3942b40c165ad7a2e1ec4796fa08a8d (diff)
downloadbuildroot-252218881b1e807ca4d625f457675f01d1158f99.tar.gz
buildroot-252218881b1e807ca4d625f457675f01d1158f99.zip
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>
-rw-r--r--package/mpd/Config.in2
-rw-r--r--package/mpd/mpd.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 5991b6f4bb..bad32f8440 100644
--- 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 26e82af0a8..f50e3d90c7 100644
--- 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
OpenPOWER on IntegriCloud