frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Eric Anholt 2018-08-07 16:23:19 -07:00 committed by Adam Jackson
parent 4ba7866770
commit 1fc20b985c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/meson.build
View File

@ -72,7 +72,8 @@ elif cc.compiles('''
endif endif
conf_data.set('HAVE_LIBBSD', libbsd_dep.found()) 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', build_udev)
conf_data.set('CONFIG_UDEV_KMS', build_udev) conf_data.set('CONFIG_UDEV_KMS', build_udev)
conf_data.set('HAVE_DBUS', build_dbus) conf_data.set('HAVE_DBUS', build_dbus)

7
meson.build
View File

@ -96,6 +96,12 @@ nettle_dep = dependency('nettle')
dbus_required = get_option('systemd_logind') == 'true' dbus_required = get_option('systemd_logind') == 'true'
dbus_dep = dependency('dbus-1', version: '>= 1.0', required: dbus_required) 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 build_hashtable = false
# Resolve default values of some options # Resolve default values of some options
@ -455,6 +461,7 @@ common_dep = [
xcmiscproto_dep, xcmiscproto_dep,
bigreqsproto_dep, bigreqsproto_dep,
xtrans_dep, xtrans_dep,
libsystemd_daemon_dep,
videoproto_dep, videoproto_dep,
compositeproto_dep, compositeproto_dep,