summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2022-09-23 14:18:43 +0000
committerMichael Catanzaro <mcatanzaro@gnome.org>2022-09-23 14:18:43 +0000
commit233ed982f112d3d6f88709ff2bf0a62dfa50c6e9 (patch)
treed3f5f9951fc40600a240b881570ae6c042582652
parent8bcf29ed63c05257df3703bb91bdd6680a9ae850 (diff)
downloadgrilo-plugins-233ed982f112d3d6f88709ff2bf0a62dfa50c6e9.tar.gz
Revert "build: Don't build dmap plugin when soup 3 is used"
This reverts commit 8bcf29ed63c05257df3703bb91bdd6680a9ae850
-rw-r--r--meson.build15
1 files changed, 6 insertions, 9 deletions
diff --git a/meson.build b/meson.build
index 7c313a2..dce2069 100644
--- a/meson.build
+++ b/meson.build
@@ -67,6 +67,12 @@ gstreamer_dep = dependency('gstreamer-1.0', required: false)
gthread_dep = dependency('gthread-2.0', required: false)
json_glib_dep = dependency('json-glib-1.0', required: false)
libarchive_dep = dependency('libarchive', required: false)
+libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '>= 3.9.9', required: false)
+if libdmapsharing4_dep.found()
+ libdmapsharing_dep = libdmapsharing4_dep
+else
+ libdmapsharing_dep = dependency('libdmapsharing-3.0', version: '>= 2.9.12', required: false)
+endif
libmediaart_dep = dependency('libmediaart-2.0', required: false)
if soup_api_version == '2.4'
libsoup_dep = dependency('libsoup-2.4', required: false)
@@ -79,15 +85,6 @@ else
libsoup24_dep = dependency('unresolvable-dep', required: false)
libgdata_dep = dependency('unresolvable-dep', required: false)
endif
-if soup_api_version == '2.4'
- libdmapsharing4_dep = dependency('libdmapsharing-4.0', version: '>= 3.9.9', required: false)
- if libdmapsharing4_dep.found()
- libdmapsharing_dep = libdmapsharing4_dep
- else
- libdmapsharing_dep = dependency('libdmapsharing-3.0', version: '>= 2.9.12', required: false)
- endif
-endif
-
libxml_dep = dependency('libxml-2.0', required: false)
oauth_dep = dependency('oauth', required: false)
sqlite3_dep = dependency('sqlite3', required: false)