[gnome-disk-utility] build: Simplified logind option check
- From: Kai Lüke <kailueke src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] build: Simplified logind option check
- Date: Sun, 7 Jul 2019 12:25:51 +0000 (UTC)
commit 91f481397ac1dfed866af041082f6ee243d8c930
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu Jul 4 08:02:37 2019 +0200
build: Simplified logind option check
The `logind` option check has been simplified a little bit. In the
summary instead of showing if its been enabled or not, it shows the
option value now.
meson.build | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 11a82004..3c314f0a 100644
--- a/meson.build
+++ b/meson.build
@@ -88,13 +88,11 @@ gio_schemasdir = dependency('gio-2.0').get_pkgconfig_variable(
)
# *** Check for logind ***
-if get_option('logind') == 'libsystemd'
- logind_dep = dependency('libsystemd', version: '>= 209')
+logind = get_option('logind')
+enable_logind = (logind != 'none')
+if enable_logind
+ logind_dep = dependency(logind, version: '>= 209')
endif
-if get_option('logind') == 'libelogind'
- logind_dep = dependency('libelogind', version: '>= 209')
-endif
-enable_logind = get_option('logind') != 'none'
config_h.set('HAVE_LOGIND', enable_logind,
description: 'Define to 1 if logind API is available')
@@ -132,7 +130,7 @@ output += ' libexecdir: ' + gdu_libexecdir + '\n'
output += ' localedir: ' + gdu_localedir + '\n'
output += ' mandir: ' + gdu_mandir + '\n'
output += ' sysconfdir: ' + gdu_sysconfdir + '\n\n'
-output += ' Use logind: ' + enable_logind.to_string() + '\n'
+output += ' Use logind: ' + logind + '\n'
output += ' Build g-s-d plug-in: ' + enable_gsd_plugin.to_string() + '\n\n'
output += ' compiler: ' + cc.get_id() + '\n'
output += ' cflags: ' + ' '.join(compiler_flags) + '\n\n'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]