[libwnck] meson: Fix -Dstartup_notification=enabled/disabled
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libwnck] meson: Fix -Dstartup_notification=enabled/disabled
- Date: Mon, 12 Aug 2019 15:24:12 +0000 (UTC)
commit 0d9ff7db63af568feef8e8c566e249058ccfcb4e
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date: Wed May 1 14:05:44 2019 +0200
meson: Fix -Dstartup_notification=enabled/disabled
'enabled' made the dependency required but did not set
HAVE_STARTUP_NOTIFICATION. 'disabled' behaved the same as 'auto'.
We are not allowed to compare booleans and feature option values, so
just add everything to the configuration.
Fixes https://gitlab.gnome.org/GNOME/libwnck/issues/139
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6e35c00..28799d8 100644
--- a/meson.build
+++ b/meson.build
@@ -43,7 +43,7 @@ pkg_deps = [
{'name': 'glib-2.0', 'version': '>= 2.32' },
{'name': 'gobject-2.0', 'version': '>= 2.13.0' },
{'name': 'gtk+-3.0', 'version': '>= 3.22.0' },
- {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required':
get_option('startup_notification').enabled() },
+ {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required':
get_option('startup_notification')},
{'name': X11_PACKAGE },
{'name': XRES_PACKAGE, 'required': false},
]
@@ -54,7 +54,7 @@ foreach p: pkg_deps
dep = dependency(pkg, version: p.get('version', []), required: required)
LIBWNCK_DEPS += dep
- if not required and dep.found()
+ if dep.found()
conf.set('HAVE_' + pkg.to_upper().underscorify(), 1)
endif
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]