From 3ca855f2642239ea83c424d8bae5c2a514e55e3b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 18 May 2022 15:23:01 +0100 Subject: [PATCH] build: Use AS_IF for system bus socket Signed-off-by: Simon McVittie --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ecff6a042..c15ee151a 100644 --- a/configure.ac +++ b/configure.ac @@ -1330,14 +1330,15 @@ AS_HELP_STRING([--with-systemduserunitdir=DIR], [Directory for systemd user serv AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) ##### Set up location for system bus socket -if ! test -z "$with_system_socket"; then - DBUS_SYSTEM_SOCKET=$with_system_socket -else + +AS_IF([! test -z "$with_system_socket"], + [DBUS_SYSTEM_SOCKET=$with_system_socket], + [ # We don't use runstatedir for this (yet?), because /var/run has been the # interoperable system bus socket for 10+ years. # See https://bugs.freedesktop.org/show_bug.cgi?id=101628 DBUS_SYSTEM_SOCKET=${EXPANDED_LOCALSTATEDIR}/run/dbus/system_bus_socket -fi + ]) AC_SUBST(DBUS_SYSTEM_SOCKET) AC_DEFINE_UNQUOTED(DBUS_SYSTEM_SOCKET,"$DBUS_SYSTEM_SOCKET",[The name of the socket the system bus listens on by default]) -- 2.47.3