From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 4 Jan 2012 18:20:06 +0000 (+0000)
Subject: Revert "made session service dirs customizable: cmake part"
X-Git-Tag: dbus-1.5.10~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f56a55af1aff5a2c7973dabeb84e3dfcbcf28e3b;p=platform%2Fupstream%2Fdbus.git

Revert "made session service dirs customizable: cmake part"

This reverts commit 89e453216c02bb85c5e53d459997f8bc3b2c73d4.
It makes the tests fail under autotools.
---

diff --git a/bus/session.conf.in b/bus/session.conf.in
index c7b345d..e121ff9 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -14,7 +14,7 @@
 
   <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen>
 
-  @DBUS_SESSION_SERVICE_DIRS@
+  <standard_session_servicedirs />
 
   <policy context="default">
     <!-- Allow everything to be sent -->
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index e712480..faf9a8e 100644
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -10,8 +10,6 @@ set (config_DATA
 	system.conf
 )
 
-# setup parameters for conf generating
-set (DBUS_SESSION_SERVICE_DIRS "<standard_session_servicedirs />")
 # config files for installation 
 CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY)
 CONFIGURE_FILE( "system.conf.cmake" "${CMAKE_CURRENT_BINARY_DIR}/system.conf" IMMEDIATE @ONLY)
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 014c170..8657e4c 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(test)
 
-set (DBUS_SESSION_SERVICE_DIRS "<servicedir>${CMAKE_BINARY_DIR}/test/data/valid-service-files</servicedir>")
-CONFIGURE_FILE( "../../bus/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/run-with-tmp-session-bus.conf" IMMEDIATE @ONLY)
-
 add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 
 add_library(dbus-testutils STATIC