1 files changed, 5 insertions, 21 deletions

diff --git a/meson.build b/meson.build
index bb60bc89..bffbe312 100644
--- a/meson.build
+++ b/meson.build
@@ -32,8 +32,6 @@ if is_freebsd
         add_project_arguments('-D_C11_SOURCE', language: 'c')
 endif
 
-swayidle_deps = []
-
 jsonc          = dependency('json-c', version: '>=0.13')
 pcre           = dependency('libpcre')
 wlroots        = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
@@ -48,6 +46,7 @@ pango          = dependency('pango')
 pangocairo     = dependency('pangocairo')
 gdk_pixbuf     = dependency('gdk-pixbuf-2.0', required: false)
 pixman         = dependency('pixman-1')
+libevdev       = dependency('libevdev')
 libinput       = dependency('libinput', version: '>=1.6.0')
 libpam         = cc.find_library('pam', required: false)
 crypt          = cc.find_library('crypt', required: false)
@@ -67,6 +66,7 @@ endif
 conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found())
 conf_data.set10('HAVE_SYSTEMD', systemd.found())
 conf_data.set10('HAVE_ELOGIND', elogind.found())
+conf_data.set10('HAVE_TRAY', get_option('enable-tray') and (systemd.found() or elogind.found()))
 
 if not systemd.found() and not elogind.found()
         warning('The sway binary must be setuid when compiled without (e)logind')
@@ -86,7 +86,6 @@ if scdoc.found()
                 'sway/sway-output.5.scd',
                 'swaylock/swaylock.1.scd',
                 'swaymsg/swaymsg.1.scd',
-                'swayidle/swayidle.1.scd',
                 'swaynag/swaynag.1.scd',
                 'swaynag/swaynag.5.scd',
         ]
@@ -108,13 +107,7 @@ if scdoc.found()
         endforeach
 endif
 
-# If prefix is '/usr', sysconfdir will be explicitly set to '/etc' by Meson to
-# enforce FHS compliance, so we should look for configs there as well.
-if prefix == '/usr'
-        add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
-else
-        add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c')
-endif
+add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
 
 version = get_option('sway-version')
 if version != ''
@@ -152,21 +145,13 @@ subdir('swaymsg')
 subdir('client')
 subdir('swaybg')
 subdir('swaybar')
-subdir('swayidle')
 subdir('swaynag')
 subdir('swaylock')
 
 config = configuration_data()
 config.set('datadir', join_paths(prefix, datadir))
 config.set('prefix', prefix)
-
-# If prefix is '/usr', sysconfdir will be explicitly set to '/etc' by Meson to
-# enforce FHS compliance, so we should look for configs there as well.
-if prefix == '/usr'
-        config.set('sysconfdir', sysconfdir)
-else
-        config.set('sysconfdir', join_paths(prefix, sysconfdir))
-endif
+config.set('sysconfdir', join_paths(prefix, sysconfdir))
 
 configure_file(
         configuration: config,
@@ -226,7 +211,7 @@ endif
 if (get_option('bash-completions'))
         bash_files = files(
                 'completions/bash/sway',
-                'completions/bash/swayidle',
+                'completions/bash/swaybar',
                 'completions/bash/swaylock',
                 'completions/bash/swaymsg',
         )
@@ -238,7 +223,6 @@ endif
 if (get_option('fish-completions'))
         fish_files = files(
                 'completions/fish/sway.fish',
-                'completions/fish/swayidle.fish',
                 'completions/fish/swaylock.fish',
                 'completions/fish/swaymsg.fish',
                 'completions/fish/swaynag.fish',