[rhythmbox/mesonjunk: 7/11] build: move plugin dependency checks down to the plugin section
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/mesonjunk: 7/11] build: move plugin dependency checks down to the plugin section
- Date: Sun, 29 May 2022 07:50:35 +0000 (UTC)
commit 9c5de2d0d9feb1b6ea05d03fab5a8e6b8c54d94b
Author: Jonathan Matthew <jonathan d14n org>
Date: Sat May 28 22:07:46 2022 +1000
build: move plugin dependency checks down to the plugin section
meson.build | 68 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/meson.build b/meson.build
index e3cdaac80..825049591 100644
--- a/meson.build
+++ b/meson.build
@@ -77,28 +77,6 @@ if gudev.found()
cdata.set('HAVE_GUDEV', 1)
endif
-use_ipod = false
-libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
-if libgpod.found()
- use_ipod = true
-endif
-
-use_mtp = false
-libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
-if libmtp.found()
- if use_gudev
- use_mtp = true
- elif get_option('mtp').enabled()
- error('MTP explicitly requested but GUdev is not available')
- endif
-endif
-
-use_notify = false
-libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
-if libnotify.found()
- use_notify = true
-endif
-
use_libsecret = false
libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
if libsecret.found()
@@ -107,18 +85,6 @@ endif
cdata.set('PY_LIBSECRET_ENABLED', use_libsecret)
cdata.set('WITH_LIBSECRET', use_libsecret)
-use_lirc = false
-lirc = dependency('lirc', required: get_option('lirc'))
-if lirc.found()
- use_lirc = true
-endif
-
-have_libbrasero_media = false
-brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
-if brasero_media.found()
- have_libbrasero_media = true
-endif
-
have_gnu_fwrite_unlocked = false
if cc.has_function('fwrite_unlocked')
have_gnu_fwrite_unlocked = cc.has_header_symbol('stdio.h', 'fwrite_unlocked')
@@ -196,6 +162,40 @@ endif
##########
# Plugins
+use_ipod = false
+libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
+if libgpod.found()
+ use_ipod = true
+endif
+
+use_mtp = false
+libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
+if libmtp.found()
+ if use_gudev
+ use_mtp = true
+ elif get_option('mtp').enabled()
+ error('MTP explicitly requested but GUdev is not available')
+ endif
+endif
+
+use_notify = false
+libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
+if libnotify.found()
+ use_notify = true
+endif
+
+use_lirc = false
+lirc = dependency('lirc', required: get_option('lirc'))
+if lirc.found()
+ use_lirc = true
+endif
+
+have_libbrasero_media = false
+brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
+if brasero_media.found()
+ have_libbrasero_media = true
+endif
+
enable_fm_radio = false
if get_option('fm_radio').allowed()
if cc.has_header('linux/videodev2.h')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]