From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 1 Dec 2009 10:59:53 +0000 (+0100)
Subject: added cmake option for using nonce-tcp protocol as default; set tcp as default protoc... 
X-Git-Tag: dbus-1.3.1~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c31f849321dd8880900e7ae1a921e570d256606;p=thirdparty%2Fdbus.git

added cmake option for using nonce-tcp protocol as default; set tcp as default protocol to be compatible with earlier dbus releases
---

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 937da832e..66b0e0e22 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -459,8 +459,14 @@ set (DBUS_USER )
 
 
 if (WIN32)
-  set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0")
-  set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0")
+  OPTION(DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS "Use nonce tcp default address" OFF)
+  if (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS)
+      set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0")
+      set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0")
+  else (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS)
+      set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=12434")
+      set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS  "tcp:host=localhost,port=12434")
+  endif (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS)
   set (DBUS_SYSTEM_CONFIG_FILE "etc/system.conf")
   set (DBUS_SESSION_CONFIG_FILE "etc/session.conf")
   # bus-test expects a non empty string