meson: Add detection of libsystemd-daemon.
This enables Xtrans's systemd socket activation. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
4ba7866770
commit
1fc20b985c
|
@ -72,7 +72,8 @@ elif cc.compiles('''
|
|||
endif
|
||||
|
||||
conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
|
||||
# XXX: HAVE_SYSTEMD_DAEMON
|
||||
# Note: this symbol is used by libXtrans.
|
||||
conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found())
|
||||
conf_data.set('CONFIG_UDEV', build_udev)
|
||||
conf_data.set('CONFIG_UDEV_KMS', build_udev)
|
||||
conf_data.set('HAVE_DBUS', build_dbus)
|
||||
|
|
|
@ -96,6 +96,12 @@ nettle_dep = dependency('nettle')
|
|||
dbus_required = get_option('systemd_logind') == 'true'
|
||||
dbus_dep = dependency('dbus-1', version: '>= 1.0', required: dbus_required)
|
||||
|
||||
# libsystemd-daemon was moved into libsystemd in version 209
|
||||
libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
|
||||
if not libsystemd_daemon_dep.found()
|
||||
libsystemd_daemon_dep = dependency('libsystemd-daemon', required: false)
|
||||
endif
|
||||
|
||||
build_hashtable = false
|
||||
|
||||
# Resolve default values of some options
|
||||
|
@ -455,6 +461,7 @@ common_dep = [
|
|||
xcmiscproto_dep,
|
||||
bigreqsproto_dep,
|
||||
xtrans_dep,
|
||||
libsystemd_daemon_dep,
|
||||
|
||||
videoproto_dep,
|
||||
compositeproto_dep,
|
||||
|
|
Loading…
Reference in New Issue
Block a user