From 3add77f76fb3a2129ad67b76a8d54836024857c1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 18 Apr 2013 12:21:58 +0100 Subject: [PATCH 2/3] cmake: define default_message_unix_fds so it can be substituted in session.conf This fixes a regression since 1.7.0: session.conf would be invalid when generated by cmake. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63682 Signed-off-by: Simon McVittie --- cmake/CMakeLists.txt | 4 ++++ cmake/config.h.cmake | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 9a37e40..c7f9939 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -435,6 +435,10 @@ endif (WIN32) set (DBUS_USER ) +# In Autotools this has a different default on QNX, but there seems little +# point in replicating that here; if you're on an unusual Unix, use Autotools. +set (default_message_unix_fds 1024) + # This won't work on Windows. It's not meant to - the system bus is # meaningless on Windows anyway. # diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index b0dde3d..3c7cb96 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -82,7 +82,7 @@ # define DBUS_ENABLE_X11_AUTOLAUNCH 1 #endif -#define DBUS_DEFAULT_MESSAGE_UNIX_FDS 1024 +#define DBUS_DEFAULT_MESSAGE_UNIX_FDS @default_message_unix_fds@ #define _DBUS_VA_COPY_ASSIGN(a1,a2) { a1 = a2; } -- 1.7.10.4