From d7f47c99d093ba91eb18523e14b23bde1794f5bc Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 1 Mar 2018 12:00:09 +0100 Subject: bus-launch: add dbus-broker support Both dbus-daemon and dbus-broker are now optional at compile-time, though at least one must be configured. A new configuration option is introduce in order to select the default implementation attempted at runtime. The other implementation will function as a fall-back (in case support for both are compiled in). If no default is selected, dbus-daemon remains the default as before. Unlike dbus-daemon, dbus-broker requires at-spi-bus-launch to create the listening socket and pass it in, rather than having the bus do that and send back the address. For now we follow what dbus-daemon does, and create a socket in the abstract namespace, though it might be more suitable to create a socket in $XDG_RUNTIME_DIR. The only difference users should observe is that daemons are no longer spawned by the bus implementation, but spawned and managed by the systemd user instance, though this should not lead to a difference in behavior. In particular this applies to `org.a11y.atspi.Registry`. For non-linux and non-systemd systems, dbus-daemon should continue to be used. [v2: - drop the --verbose switch, which is no longer supported - make dbus-daemon optional too - allow the default implementation to be selected] Signed-off-by: Tom Gundersen --- meson_options.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index c9afe2fa..f8ec8621 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,6 +6,15 @@ option('dbus_daemon', description: 'The path of the DBus daemon', type: 'string', value: 'default') +option('dbus_broker', + description: 'The path of the DBus broker', + type: 'string', + value: 'default') +option('default_bus', + description: 'The default DBus implementation to use', + type: 'combo', + choices: ['dbus-daemon', 'dbus-broker'], + value: 'dbus-daemon') option('systemd_user_dir', description: 'Location of the systemd user services', type: 'string', -- cgit v1.2.1