diff options
| author | Mike Gorse <mgorse@suse.com> | 2023-04-24 14:28:25 +0000 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2023-04-24 14:28:25 +0000 |
| commit | 758c5830865c1c1b1768cdec099baa140a6c1a25 (patch) | |
| tree | 08b8ecff57c3d38d11aca5ec665bcf455c20c17a | |
| parent | aef15f5540eb9b74dfd2766f95113b5f2f82f739 (diff) | |
| parent | 3848834225b90d972aa69c1f61541a2f235901b7 (diff) | |
| download | at-spi2-core-758c5830865c1c1b1768cdec099baa140a6c1a25.tar.gz | |
Merge branch 'meson-dbus-systemd' into 'main'
meson: Avoid requiring libsystemd when configured to use dbus-daemon
See merge request GNOME/at-spi2-core!134
| -rw-r--r-- | bus/meson.build | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/bus/meson.build b/bus/meson.build index 22a1bce6..2f3c5621 100644 --- a/bus/meson.build +++ b/bus/meson.build @@ -46,39 +46,38 @@ launcher_args = [ '-DDATADIR="@0@"'.format(atspi_datadir), ] -if get_option('dbus_daemon') != 'default' - launcher_args += '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon')) -else - dbus_daemon = find_program('dbus-daemon', - '/sbin/dbus-daemon', - '/usr/sbin/dbus-daemon', - '/libexec/dbus-daemon', - '/usr/libexec/dbus-daemon', - '/usr/lib/dbus-daemon', - '/usr/pkg/bin/dbus-daemon', - required: false) - if dbus_daemon.found() - launcher_args += '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path()) - endif -endif - needs_systemd = false -if get_option('dbus_broker') != 'default' - launcher_args += '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker')) - needs_systemd = true +if get_option('default_bus') == 'dbus-daemon' + if get_option('dbus_daemon') != 'default' + launcher_args += '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon')) + else + dbus_daemon = find_program('dbus-daemon', + '/sbin/dbus-daemon', + '/usr/sbin/dbus-daemon', + '/libexec/dbus-daemon', + '/usr/libexec/dbus-daemon', + '/usr/lib/dbus-daemon', + '/usr/pkg/bin/dbus-daemon', + required: false) + if dbus_daemon.found() + launcher_args += '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path()) + endif + endif else - dbus_broker = find_program('dbus-broker-launch', - required: false) - if dbus_broker.found() - launcher_args += '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path()) + launcher_args += '-DWANT_DBUS_BROKER' + if get_option('dbus_broker') != 'default' + launcher_args += '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker')) needs_systemd = true + else + dbus_broker = find_program('dbus-broker-launch', + required: false) + if dbus_broker.found() + launcher_args += '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path()) + needs_systemd = true + endif endif endif -if get_option('default_bus') == 'dbus-broker' - launcher_args += '-DWANT_DBUS_BROKER' -endif - if needs_systemd systemd_dep = dependency('libsystemd') else |