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

This commit is contained in:
Ralf Habacker 2009-12-01 11:59:53 +01:00
parent c0fa33dc5f
commit 0c31f84932

View file

@ -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