build: Only define DBUS_SESSION_SOCKET_DIR on Unix

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>

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 852021590a2773ed5fa9f089b423dd1fff68e8e6..eaa3ee85e3f71a6ea1c93cc1239840888de45068 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -32,7 +32,6 @@
 #cmakedefine DBUS_PREFIX "@DBUS_PREFIX@"
 #cmakedefine DBUS_SYSTEM_CONFIG_FILE  "@DBUS_SYSTEM_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_SYSTEM_BUS_DEFAULT_ADDRESS  "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
 #cmakedefine DBUS_SESSION_BUS_CONNECT_ADDRESS  "@DBUS_SESSION_BUS_CONNECT_ADDRESS@"
@@ -243,6 +242,7 @@
 #endif
 
 #ifdef DBUS_UNIX
+#cmakedefine DBUS_SESSION_SOCKET_DIR "@DBUS_SESSION_SOCKET_DIR@"
 /* Where to put test sockets */
 #define DBUS_TEST_SOCKET_DIR "@TEST_SOCKET_DIR@"
 #endif

diff --git a/meson.build b/meson.build
index c11f1c5a80ec7e91695347af8ea7774d9852a57a..99db2f1713d9897f85c3a65f0c129c8c4a3ae725 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1097,7 +1097,10 @@ session_socket_dir = get_option('session_socket_dir')
 if session_socket_dir == ''
     session_socket_dir = default_socket_dir
 endif
-config.set_quoted('DBUS_SESSION_SOCKET_DIR', session_socket_dir)
+
+if platform_unix
+    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
 # address you can connect to - it can be something vague like