diff options
| author |  Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-02 23:05:49 +1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-02 23:05:49 +1000 |
| commit | 706c0fbe2376e15f8140be60f3c8b0713128ebba (patch) | |
| tree | ffefcdd261970549f8b83adae8d93b6c3b9ebbbb /meson.build | |
| parent | swaynag: don't drop \n for first line (diff) | |
| parent | Merge pull request #2404 from RyanDwyer/move-containers-when-workspace-focused (diff) | |
| download | sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.tar.gz sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.tar.zst sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.zip | |
Merge branch 'master' into nagbar
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 57ed70cb..2a020323 100644 --- a/meson.build +++ b/meson.build | |||
| @@ -44,13 +44,13 @@ systemd = dependency('libsystemd', required: false) | |||
| 44 | elogind = dependency('libelogind', required: false) | 44 | elogind = dependency('libelogind', required: false) |
| 45 | math = cc.find_library('m') | 45 | math = cc.find_library('m') |
| 46 | rt = cc.find_library('rt') | 46 | rt = cc.find_library('rt') |
| 47 | xcb = dependency('xcb') | ||
| 48 | git = find_program('git', required: false) | 47 | git = find_program('git', required: false) |
| 49 | 48 | ||
| 50 | conf_data = configuration_data() | 49 | conf_data = configuration_data() |
| 51 | 50 | ||
| 52 | if get_option('enable-xwayland') | 51 | if get_option('enable-xwayland') |
| 53 | conf_data.set('HAVE_XWAYLAND', true) | 52 | conf_data.set('HAVE_XWAYLAND', true) |
| 53 | xcb = dependency('xcb') | ||
| 54 | else | 54 | else |
| 55 | conf_data.set('HAVE_XWAYLAND', false) | 55 | conf_data.set('HAVE_XWAYLAND', false) |
| 56 | endif | 56 | endif |