diff options
| author | Eric Anholt <eric@anholt.net> | 2018-08-07 16:23:19 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-08-09 13:42:54 -0400 |
| commit | 1fc20b985cc888345bc8c6fce7b43f10ce71fe43 (patch) | |
| tree | 97b2d65e794b9ed2b5dc8e37646eb8ee2266f46f | |
| parent | 4ba786677050684c8801201f6bd83ce884f2885e (diff) | |
This enables Xtrans's systemd socket activation.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/meson.build | 3 | ||||
| -rw-r--r-- | meson.build | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/meson.build b/include/meson.build index 2c139e6b0..9a7547c47 100644 --- a/include/meson.build +++ b/include/meson.build @@ -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) diff --git a/meson.build b/meson.build index ec79479d9..e7ce68a50 100644 --- a/meson.build +++ b/meson.build @@ -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, |