diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-04 18:20:06 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-04 18:20:15 +0000 |
| commit | f56a55af1aff5a2c7973dabeb84e3dfcbcf28e3b (patch) | |
| tree | 6bf8661eacc10cd61aaab74e8119ba29eb20697f | |
| parent | 4f404b560378fdb92a041532ffcfc12b6f194bec (diff) | |
Revert "made session service dirs customizable: cmake part"
This reverts commit 89e453216c02bb85c5e53d459997f8bc3b2c73d4.
It makes the tests fail under autotools.
| -rw-r--r-- | bus/session.conf.in | 2 | ||||
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/bus/session.conf.in b/bus/session.conf.in index c7b345db..e121ff93 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 e7124801..faf9a8e9 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 014c1709..8657e4c7 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 |