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 c7b345dba3bbef5704b6e1800c01b04c093cee02..e121ff93a2ec9d34a1f4b359f5908c6e78c3a22c 100644 (file)
--- 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 e71248012243116e9573a918382a93b2231788a5..faf9a8e9f6c845a6c52bc66fa724d7e2e9d467f3 100644 (file)
--- 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 014c1709698b0ac2f2e6db5289238c63fcbf5e86..8657e4c759b07480a81ee6435b2d2569efa5e5a9 100644 (file)
--- 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