Merge branch 'master' into nagbar

This commit is contained in:
Ryan Dwyer 2018-08-02 23:05:49 +10:00 committed by GitHub
commit 706c0fbe23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 77 additions and 73 deletions

View file

@ -44,13 +44,13 @@ systemd = dependency('libsystemd', required: false)
elogind = dependency('libelogind', required: false)
math = cc.find_library('m')
rt = cc.find_library('rt')
xcb = dependency('xcb')
git = find_program('git', required: false)
conf_data = configuration_data()
if get_option('enable-xwayland')
conf_data.set('HAVE_XWAYLAND', true)
xcb = dependency('xcb')
else
conf_data.set('HAVE_XWAYLAND', false)
endif