From cad851805bea6b4777685df1c6adf8cb9fa71835 Mon Sep 17 00:00:00 2001 From: emersion Date: Sun, 18 Nov 2018 00:33:06 +0100 Subject: Use #if instead of #ifdef --- meson.build | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 8327b763..bb60bc89 100644 --- a/meson.build +++ b/meson.build @@ -59,30 +59,18 @@ git = find_program('git', required: false) conf_data = configuration_data() +conf_data.set10('HAVE_XWAYLAND', get_option('enable-xwayland')) if get_option('enable-xwayland') - conf_data.set('HAVE_XWAYLAND', true) xcb = dependency('xcb') -else - conf_data.set('HAVE_XWAYLAND', false) -endif - -if gdk_pixbuf.found() - conf_data.set('HAVE_GDK_PIXBUF', true) endif -if systemd.found() - conf_data.set('SWAY_IDLE_HAS_SYSTEMD', true) - swayidle_deps += systemd -endif - -if elogind.found() - conf_data.set('SWAY_IDLE_HAS_ELOGIND', true) - swayidle_deps += elogind -endif +conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) +conf_data.set10('HAVE_SYSTEMD', systemd.found()) +conf_data.set10('HAVE_ELOGIND', elogind.found()) if not systemd.found() and not elogind.found() - warning('The sway binary must be setuid when compiled without (e)logind') - warning('You must do this manually post-install: chmod a+s /path/to/sway') + warning('The sway binary must be setuid when compiled without (e)logind') + warning('You must do this manually post-install: chmod a+s /path/to/sway') endif scdoc = find_program('scdoc', required: false) -- cgit v1.2.3-54-g00ecf