Commit 0d9ff7db authored by Jan Alexander Steffens's avatar Jan Alexander Steffens Committed by Marco Trevisan

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 #139
parent 0ceae250
Pipeline #103956 passed with stage
in 10 minutes and 5 seconds
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment