From 9ccedbcfa4df5a6375d715de06f7c3e16a8bccd3 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Tue, 6 Jul 2021 13:54:44 -0500 Subject: Use abstract sockets if libdbus is older than 1.12.0 Fixes #37 --- bus/accessibility.conf.in | 2 +- bus/meson.build | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bus/accessibility.conf.in b/bus/accessibility.conf.in index 79c51464..33d6e1c8 100644 --- a/bus/accessibility.conf.in +++ b/bus/accessibility.conf.in @@ -6,7 +6,7 @@ @DATADIR@/dbus-1/accessibility-services EXTERNAL - unix:dir=/tmp + @SOCKET_ADDRESS@ diff --git a/bus/meson.build b/bus/meson.build index 3504fb31..21408f2f 100644 --- a/bus/meson.build +++ b/bus/meson.build @@ -4,6 +4,12 @@ libexec_conf.set('libexecdir', atspi_libexecdir) accessibility_conf = configuration_data() accessibility_conf.set('DATADIR', atspi_datadir) +if libdbus_dep.version().version_compare('>= 1.12.0') + accessibility_conf.set('SOCKET_ADDRESS', 'unix:dir=/tmp') +else + accessibility_conf.set('SOCKET_ADDRESS', 'unix:tmpdir=/tmp') +endif + busconfig_dir = join_paths(atspi_datadir, 'defaults/at-spi2') session_dir = join_paths(atspi_sysconfdir, 'xdg/autostart') xwayland_session_dir = join_paths(atspi_sysconfdir, 'xdg/Xwayland-session.d') -- cgit v1.2.1