summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor V. Kovalenko <igor.v.kovalenko@gmail.com>2021-02-11 08:56:22 +0300
committerIgor V. Kovalenko <igor.v.kovalenko@gmail.com>2021-02-12 20:34:11 +0300
commitde8b7c0d8f3e486f1c853fe5049124ae0416dc4d (patch)
tree1fec2199f4617933563762dbdc26cb444a490713
parent156e16f941789c5d53cdb0c46be480c64e3149f1 (diff)
build-sys: meson: support elogind alternative for module-systemd-login
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/502>
-rw-r--r--meson.build6
-rw-r--r--meson_options.txt3
-rw-r--r--src/modules/meson.build4
3 files changed, 11 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 7da784cc8..5a1df59d9 100644
--- a/meson.build
+++ b/meson.build
@@ -655,6 +655,11 @@ if systemd_dep.found() and systemduserunitdir == ''
systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
endif
+libelogind_dep = dependency('libelogind', required : get_option('elogind'))
+if libelogind_dep.found()
+ cdata.set('HAVE_SYSTEMD_LOGIN', 1)
+endif
+
tcpwrap_dep = cc.find_library('wrap', required: get_option('tcpwrap'))
if cc.has_header('tcpd.h') and cc.has_function('hosts_access', dependencies : tcpwrap_dep)
cdata.set('HAVE_LIBWRAP', 1)
@@ -899,6 +904,7 @@ summary = [
'Enable udev: @0@'.format(udev_dep.found()),
' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')),
'Enable systemd: @0@'.format(libsystemd_dep.found()),
+ 'Enable elogind: @0@'.format(libelogind_dep.found()),
'Enable TCP Wrappers: @0@'.format(tcpwrap_dep.found()),
'Enable libsamplerate: @0@'.format(samplerate_dep.found()),
'Enable IPv6: @0@'.format(get_option('ipv6')),
diff --git a/meson_options.txt b/meson_options.txt
index ca96ea8ec..e2d08becd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -93,6 +93,9 @@ option('bluez5-ofono-headset',
option('dbus',
type : 'feature', value : 'auto',
description : 'Optional D-Bus support')
+option('elogind',
+ type : 'feature', value : 'auto',
+ description : 'Optional elogind support')
option('fftw',
type : 'feature', value : 'auto',
description : 'Optional FFTW support')
diff --git a/src/modules/meson.build b/src/modules/meson.build
index fce3c8814..f9b46f844 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -203,9 +203,9 @@ if openssl_dep.found()
endif
endif
-if libsystemd_dep.found()
+if libsystemd_dep.found() or libelogind_dep.found()
all_modules += [
- [ 'module-systemd-login', 'module-systemd-login.c', [], [], [libsystemd_dep] ],
+ [ 'module-systemd-login', 'module-systemd-login.c', [], [], [libsystemd_dep, libelogind_dep] ],
]
endif