fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-20 06:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Only define DBUS_SESSION_SOCKET_DIR on Unix

Browse source 
This is not used on Windows (in fact it's only used in the
dbus-cleanup-sockets(1) tool) so it's OK for it to have a value like /tmp
that would be inappropriate on Windows. Make that more obvious.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2025-04-28 13:35:08 +01:00
parent 8a9fddb26d
commit a363b7c998
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/config.h.cmake
View file

@ -32,7 +32,6 @@
#cmakedefine DBUS_PREFIX "@DBUS_PREFIX@" #cmakedefine DBUS_PREFIX "@DBUS_PREFIX@"
#cmakedefine DBUS_SYSTEM_CONFIG_FILE "@DBUS_SYSTEM_CONFIG_FILE@" #cmakedefine DBUS_SYSTEM_CONFIG_FILE "@DBUS_SYSTEM_CONFIG_FILE@"
#cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@" #cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@"
#cmakedefine DBUS_SESSION_SOCKET_DIR "@DBUS_SESSION_SOCKET_DIR@"
#cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@" #cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@"
#cmakedefine DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@" #cmakedefine DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
#cmakedefine DBUS_SESSION_BUS_CONNECT_ADDRESS "@DBUS_SESSION_BUS_CONNECT_ADDRESS@" #cmakedefine DBUS_SESSION_BUS_CONNECT_ADDRESS "@DBUS_SESSION_BUS_CONNECT_ADDRESS@"
@ -243,6 +242,7 @@
#endif #endif
#ifdef DBUS_UNIX #ifdef DBUS_UNIX
#cmakedefine DBUS_SESSION_SOCKET_DIR "@DBUS_SESSION_SOCKET_DIR@"
/* Where to put test sockets */ /* Where to put test sockets */
#define DBUS_TEST_SOCKET_DIR "@TEST_SOCKET_DIR@" #define DBUS_TEST_SOCKET_DIR "@TEST_SOCKET_DIR@"
#endif #endif

3
meson.build
View file

@ -1097,7 +1097,10 @@ session_socket_dir = get_option('session_socket_dir')
if session_socket_dir == '' if session_socket_dir == ''
session_socket_dir = default_socket_dir session_socket_dir = default_socket_dir
endif endif
if platform_unix
config.set_quoted('DBUS_SESSION_SOCKET_DIR', session_socket_dir) config.set_quoted('DBUS_SESSION_SOCKET_DIR', session_socket_dir)
endif
# This must be a listening address. It doesn't necessarily need to be an # This must be a listening address. It doesn't necessarily need to be an
# address you can connect to - it can be something vague like # address you can connect to - it can be something vague like