diff options
author | 2018-04-04 22:36:09 -0400 | |
---|---|---|
committer | 2018-04-04 22:36:09 -0400 | |
commit | 65f254f3fbc83d006d4ec29170ec8a8695345d6c (patch) | |
tree | 3044fb62120ca23499d31275076af50db09a9850 /meson.build | |
parent | fix focus child (diff) | |
parent | Merge pull request #1732 from emersion/view-children (diff) | |
download | sway-65f254f3fbc83d006d4ec29170ec8a8695345d6c.tar.gz sway-65f254f3fbc83d006d4ec29170ec8a8695345d6c.tar.zst sway-65f254f3fbc83d006d4ec29170ec8a8695345d6c.zip |
Merge branch 'wlroots' into fix-focus-inactive
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 01788fd9..d02a446b 100644 --- a/meson.build +++ b/meson.build | |||
@@ -35,6 +35,7 @@ gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: false) | |||
35 | pixman = dependency('pixman-1') | 35 | pixman = dependency('pixman-1') |
36 | libcap = dependency('libcap') | 36 | libcap = dependency('libcap') |
37 | libinput = dependency('libinput') | 37 | libinput = dependency('libinput') |
38 | libpam = cc.find_library('libpam') | ||
38 | math = cc.find_library('m') | 39 | math = cc.find_library('m') |
39 | rt = cc.find_library('rt') | 40 | rt = cc.find_library('rt') |
40 | git = find_program('git', required: false) | 41 | git = find_program('git', required: false) |
@@ -105,6 +106,7 @@ subdir('swaymsg') | |||
105 | subdir('client') | 106 | subdir('client') |
106 | subdir('swaybg') | 107 | subdir('swaybg') |
107 | subdir('swaybar') | 108 | subdir('swaybar') |
109 | subdir('swaylock') | ||
108 | 110 | ||
109 | config = configuration_data() | 111 | config = configuration_data() |
110 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) | 112 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) |