From a68517a61c2081117691a86d809ea0cab38e9fd3 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@sag.eu>
Date: Wed, 17 Apr 2013 16:52:54 +0200
Subject: [PATCH] Add DEFAULT_MESSAGES_UNIX_FDS to cmake build system.

Also converted related variable to upper case as already used in other places.
---
 bus/session.conf.in  |    2 +-
 cmake/CMakeLists.txt |    1 +
 configure.ac         |    6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bus/session.conf.in b/bus/session.conf.in
index bb6f70b..f547a19 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -49,7 +49,7 @@
   <limit name="max_outgoing_bytes">1000000000</limit>
   <limit name="max_outgoing_unix_fds">250000000</limit>
   <limit name="max_message_size">1000000000</limit>
-  <limit name="max_message_unix_fds">@default_message_unix_fds@</limit>
+  <limit name="max_message_unix_fds">@DEFAULT_MESSAGES_UNIX_FDS@</limit>
   <limit name="service_start_timeout">120000</limit>  
   <limit name="auth_timeout">240000</limit>
   <limit name="max_completed_connections">100000</limit>  
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 9a37e40..656aba2 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -434,6 +434,7 @@ endif (WIN32)
 #AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
 
 set (DBUS_USER )
+set (DEFAULT_MESSAGES_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/configure.ac b/configure.ac
index c55ced7..0f0a26f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1299,13 +1299,13 @@ fi
 # Determine maximum number of Unix fds which may be passed
 AS_CASE([$host_os],
   [*qnx*],
-    [default_message_unix_fds=256],
+    [DEFAULT_MESSAGES_UNIX_FDS=256],
   [*],
-    [default_message_unix_fds=1024])
+    [DEFAULT_MESSAGES_UNIX_FDS=1024])
 AC_DEFINE_UNQUOTED([DBUS_DEFAULT_MESSAGE_UNIX_FDS],
   [$default_message_unix_fds],
   [Default for dbus_connection_get_max_message_unix_fds()])
-AC_SUBST([default_message_unix_fds])
+AC_SUBST([DEFAULT_MESSAGES_UNIX_FDS])
 
 #### Set up final flags
 LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs"
-- 
1.7.4.msysgit.0