mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: add prefix to libseat options

Browse source 
The option names are a little bit confusing, because it's not clear
which ones toggle libseat features, and which ones toggle seatd
features.

Add a "libseat-" prefix to libseat-specific features, to make it
more obvious that they only are about the library.
This commit is contained in:
Simon Ser 2021-06-23 08:08:33 +00:00 • committed by Kenny Levinsen
parent bff09d8859
commit 2204db5531
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
meson.build
View file

@ -102,8 +102,8 @@ server_files = [
'seatd/server.c', 'seatd/server.c',
] ]
with_seatd = get_option('seatd') == 'enabled' with_seatd = get_option('libseat-seatd') == 'enabled'
with_builtin = get_option('builtin') == 'enabled' with_builtin = get_option('libseat-builtin') == 'enabled'
with_server = get_option('server') == 'enabled' with_server = get_option('server') == 'enabled'
if with_seatd or with_builtin if with_seatd or with_builtin
@ -116,11 +116,11 @@ endif
logind = disabler() logind = disabler()
logind_provider = '' logind_provider = ''
if get_option('logind') != 'disabled' if get_option('libseat-logind') != 'disabled'
if get_option('logind') == 'auto' and get_option('auto_features').disabled() if get_option('libseat-logind') == 'auto' and get_option('auto_features').disabled()
# Disable logind # Disable logind
elif get_option('logind') == 'auto' elif get_option('libseat-logind') == 'auto'
assert(get_option('auto_features').auto(), '-Dlogind must be set to systemd or elogind since auto_features != auto') assert(get_option('auto_features').auto(), '-Dlibseat-logind must be set to systemd or elogind since auto_features != auto')
foreach logind_provider : ['elogind', 'systemd'] foreach logind_provider : ['elogind', 'systemd']
logind = dependency('lib@0@'.format(logind_provider), required: false) logind = dependency('lib@0@'.format(logind_provider), required: false)
if logind.found() if logind.found()
@ -128,7 +128,7 @@ if get_option('logind') != 'disabled'
endif endif
endforeach endforeach
else else
logind_provider = get_option('logind') logind_provider = get_option('libseat-logind')
logind = dependency('lib@0@'.format(logind_provider)) logind = dependency('lib@0@'.format(logind_provider))
endif endif
@ -258,9 +258,9 @@ if scdoc.found()
endif endif
summary({ summary({
'seatd': with_seatd, 'libseat-seatd': with_seatd,
'builtin': with_builtin, 'libseat-builtin': with_builtin,
'libseat-systemd': logind.found() and logind_provider == 'systemd',
'libseat-elogind': logind.found() and logind_provider == 'elogind',
'server': with_server, 'server': with_server,
'systemd': logind.found() and logind_provider == 'systemd',
'elogind': logind.found() and logind_provider == 'elogind',
}, bool_yn: true) }, bool_yn: true)

6
meson_options.txt
View file

@ -1,6 +1,6 @@
option('logind', type: 'combo', choices: ['auto', 'disabled', 'elogind', 'systemd'], value: 'auto', description: 'logind support') option('libseat-logind', type: 'combo', choices: ['auto', 'disabled', 'elogind', 'systemd'], value: 'auto', description: 'logind support for libseat')
option('seatd', type: 'combo', choices: ['enabled', 'disabled'], value: 'enabled', description: 'seatd support') option('libseat-seatd', type: 'combo', choices: ['enabled', 'disabled'], value: 'enabled', description: 'seatd support for libseat')
option('builtin', type: 'combo', choices: ['enabled', 'disabled'], value: 'disabled', description: 'builtin seatd server') option('libseat-builtin', type: 'combo', choices: ['enabled', 'disabled'], value: 'disabled', description: 'built-in seatd server for libseat')
option('server', type: 'combo', choices: ['enabled', 'disabled'], value: 'enabled', description: 'seatd server') option('server', type: 'combo', choices: ['enabled', 'disabled'], value: 'enabled', description: 'seatd server')
option('examples', type: 'combo', choices: ['enabled', 'disabled'], value: 'disabled', description: 'libseat example programs') option('examples', type: 'combo', choices: ['enabled', 'disabled'], value: 'disabled', description: 'libseat example programs')
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')