diff options
author | Adrian Perez de Castro <aperez@igalia.com> | 2023-04-24 12:09:50 +0300 |
---|---|---|
committer | Mike Gorse <mgorse@suse.com> | 2023-05-10 12:39:16 -0500 |
commit | 6c165512fc0d33ba62bff5936b1593480193e764 (patch) | |
tree | 1704163d9f02c91d98753c62dd1c1fba2c8520f5 | |
parent | 6a5022321bf412f1fb5deeb49ee7e96a49f9f784 (diff) | |
download | at-spi2-core-6c165512fc0d33ba62bff5936b1593480193e764.tar.gz |
meson: Avoid requiring libsystemd when configured to use dbus-daemon
Checks for dbus-daemon and dbus-broker only when they are chosen
with default_bus. This avoids requiring the systemd libraries if
one wants the built at-spi2-core to use dbus-daemon, but dbus-worker
is somehow available in the $PATH. A typical scenario is cross
compilation, where the build host may have a dbus-broker program
available, but the target system may not have it (or may not have
nor want to use the systemd libraries).
-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 |