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

build: don't allow "auto" for seatd, builtin, server and examples

Browse source 
These features don't have any dependencies, so "auto" doesn't make
sense.
This commit is contained in:
Simon Ser 2021-04-07 14:30:04 +02:00 • committed by Kenny Levinsen
parent ee40913810
commit 753c5276cf
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
meson.build
View file

@ -102,7 +102,11 @@ server_files = [
'seatd/server.c', 'seatd/server.c',
] ]
if get_option('seatd').enabled() with_seatd = get_option('seatd') == 'enabled'
with_builtin = get_option('builtin') == 'enabled'
with_server = get_option('server') == 'enabled'
if with_seatd
private_files += 'libseat/backend/seatd.c' private_files += 'libseat/backend/seatd.c'
add_project_arguments('-DSEATD_ENABLED=1', language: 'c') add_project_arguments('-DSEATD_ENABLED=1', language: 'c')
endif endif
@ -134,7 +138,7 @@ if get_option('logind') != 'disabled'
endif endif
endif endif
if get_option('builtin').enabled() if with_builtin
add_project_arguments('-DBUILTIN_ENABLED=1', language: 'c') add_project_arguments('-DBUILTIN_ENABLED=1', language: 'c')
private_files += server_files private_files += server_files
endif endif
@ -175,7 +179,7 @@ libseat = declare_dependency(
include_directories: include_directories('include', is_system: true), include_directories: include_directories('include', is_system: true),
) )
if get_option('server').enabled() if with_server
executable( executable(
'seatd', 'seatd',
[ server_files, 'seatd/seatd.c' ], [ server_files, 'seatd/seatd.c' ],
@ -184,7 +188,7 @@ if get_option('server').enabled()
) )
endif endif
if get_option('examples').enabled() if get_option('examples') == 'enabled'
executable( executable(
'simpletest', 'simpletest',
['examples/simpletest/main.c'], ['examples/simpletest/main.c'],
@ -207,7 +211,7 @@ foreach name, value : tests
include_directories: [include_directories('.', 'include')])) include_directories: [include_directories('.', 'include')]))
endforeach endforeach
if get_option('server').enabled() if with_server
scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true) scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
else else
scdoc = disabler() scdoc = disabler()
@ -236,8 +240,9 @@ if scdoc.found()
endif endif
summary({ summary({
'seatd': get_option('seatd').enabled(), 'seatd': with_seatd,
'builtin': get_option('builtin').enabled(), 'builtin': with_builtin,
'server': with_server,
'systemd': logind.found() and logind_provider == 'systemd', 'systemd': logind.found() and logind_provider == 'systemd',
'elogind': logind.found() and logind_provider == 'elogind', 'elogind': logind.found() and logind_provider == 'elogind',
}, bool_yn: true) }, bool_yn: true)

8
meson_options.txt
View file

@ -1,7 +1,7 @@
option('logind', type: 'combo', choices: ['auto', 'disabled', 'elogind', 'systemd'], value: 'auto', description: 'logind support') option('logind', type: 'combo', choices: ['auto', 'disabled', 'elogind', 'systemd'], value: 'auto', description: 'logind support')
option('seatd', type: 'feature', value: 'enabled', description: 'seatd support') option('seatd', type: 'combo', choices: ['enabled', 'disabled'], value: 'enabled', description: 'seatd support')
option('builtin', type: 'feature', value: 'disabled', description: 'builtin seatd server') option('builtin', type: 'combo', choices: ['enabled', 'disabled'], value: 'disabled', description: 'builtin seatd server')
option('server', type: 'feature', value: 'enabled', description: 'seatd server') option('server', type: 'combo', choices: ['enabled', 'disabled'], value: 'enabled', description: 'seatd server')
option('examples', type: 'feature', 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')
option('defaultpath', type: 'string', value: '', description: 'Default location for seatd socket (empty for default)') option('defaultpath', type: 'string', value: '', description: 'Default location for seatd socket (empty for default)')