~kennylevinsen/seatd-devel

build: fixup standalone without seatd v1 SUPERSEDED

ayaka
ayaka: 1
 build: fixup standalone without seatd

 2 files changed, 5 insertions(+), 6 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~kennylevinsen/seatd-devel/patches/22143/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH] build: fixup standalone without seatd Export this patch

ayaka
I think that server option means the same thing as seatd, so I
get rid of it.
---
 meson.build       | 10 +++++-----
 meson_options.txt |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 7a70cb6..a2166c5 100644
--- a/meson.build
+++ b/meson.build
@@ -104,10 +104,11 @@ server_files = [

with_seatd = get_option('seatd') == 'enabled'
with_builtin = get_option('builtin') == 'enabled'
with_server = get_option('server') == 'enabled'

if with_seatd
if with_seatd or with_builtin
	private_files += 'libseat/backend/seatd.c'
endif
if with_seatd
	add_project_arguments('-DSEATD_ENABLED=1', language: 'c')
endif

@@ -189,7 +190,7 @@ libseat = declare_dependency(
	variables: libseat_vars,
)

if with_server
if with_seatd
	executable(
		'seatd',
		[ server_files, 'seatd/seatd.c' ],
@@ -221,7 +222,7 @@ foreach name, value : tests
		include_directories: [include_directories('.', 'include')]))
endforeach

if with_server
if with_seatd
	scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
else
	scdoc = disabler()
@@ -252,7 +253,6 @@ endif
summary({
	'seatd': with_seatd,
	'builtin': with_builtin,
	'server': with_server,
	'systemd': logind.found() and logind_provider == 'systemd',
	'elogind': logind.found() and logind_provider == 'elogind',
}, bool_yn: true)
diff --git a/meson_options.txt b/meson_options.txt
index 144ce7a..c61d473 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,6 @@
option('logind', type: 'combo', choices: ['auto', 'disabled', 'elogind', 'systemd'], value: 'auto', description: 'logind support')
option('seatd', type: 'combo', choices: ['enabled', 'disabled'], value: 'enabled', description: 'seatd support')
option('builtin', type: 'combo', choices: ['enabled', 'disabled'], value: 'disabled', description: 'builtin 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('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)')
-- 
2.30.2
This patch does two things at once:
This patch does two things at once:

- Removes the "server" option
- Fixes the build without the seatd executable and with the builtin
  backend enabled

I don't think these are related.