Merge remote-tracking branch 'upstream/master' into output-damage

This commit is contained in:
emersion 2018-01-28 21:22:50 +01:00
commit 1ee61dbd0f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
11 changed files with 87 additions and 26 deletions

View file

@ -33,11 +33,11 @@ else
backend_files += files('session/direct.c')
endif
if systemd.found()
if systemd.found() and get_option('enable_systemd')
backend_files += files('session/logind.c')
endif
if elogind.found()
if elogind.found() and get_option('enable_elogind')
backend_files += files('session/logind.c')
endif