build: disable logind on -Dauto_features=disabled -Dlogind=auto v1 APPLIED

Simon Ser: 1
 build: disable logind on -Dauto_features=disabled -Dlogind=auto

 1 files changed, 3 insertions(+), 1 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/21951/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH] build: disable logind on -Dauto_features=disabled -Dlogind=auto Export this patch

Setting auto_features=disabled is supposed to disable all optional
dependencies. Since we aren't using a feature option here, we need
to manually add logic to disable logind in this case.
 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 722735a6835b..a7e473433530 100644
--- a/meson.build
+++ b/meson.build
@@ -114,7 +114,9 @@ endif
logind = disabler()
logind_provider = ''
if get_option('logind') != 'disabled'
	if get_option('logind') == 'auto'
	if get_option('logind') == 'auto' and get_option('auto_features').disabled()
		# Disable logind
	elif get_option('logind') == 'auto'
		assert(get_option('auto_features').auto(), '-Dlogind must be set to systemd or elogind since auto_features != auto')
		foreach logind_provider : ['elogind', 'systemd']
			logind = dependency('lib@0@'.format(logind_provider), required: false)
Applied, thanks!