diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2011-09-29 10:30:33 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2011-09-29 14:08:03 +0200 |
| commit | 797350415653f1db32e70bfdb2071e9ec059656e (patch) | |
| tree | efc876c9d254f0d4e7aecc69f197181fda573286 /cmake/bus | |
| parent | c141af614729d7d96ad4acfdaabe2496465e5025 (diff) | |
| download | dbus-797350415653f1db32e70bfdb2071e9ec059656e.tar.gz | |
Merged cmake and autotools session bus configuration
cmake and autotools session bus configuration templates are identical,
so cmake now uses the autotools.
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319
Diffstat (limited to 'cmake/bus')
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/bus/session.conf.cmake | 30 |
2 files changed, 2 insertions, 33 deletions
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 1db519f8..3a4b9793 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -11,9 +11,8 @@ set (config_DATA ) # config files for installation -FOREACH(file ${config_DATA}) - CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/${file}.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${file}" IMMEDIATE @ONLY) -ENDFOREACH(file) +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) # copy services for local daemon start to local service dir data/dbus-1/services SET (SERVICE_FILES test/data/valid-service-files) diff --git a/cmake/bus/session.conf.cmake b/cmake/bus/session.conf.cmake deleted file mode 100644 index 6bba91e9..00000000 --- a/cmake/bus/session.conf.cmake +++ /dev/null @@ -1,30 +0,0 @@ -<!-- This configuration file controls the per-user-login-session message bus. - Add a session-local.conf and edit that rather than changing this - file directly. --> - -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <!-- Our well-known bus type, don't change this --> - <type>session</type> - - <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen> - - <standard_session_servicedirs /> - - <policy context="default"> - <!-- Allow everything to be sent --> - <allow send_destination="*"/> - <!-- Allow everything to be received --> - <allow eavesdrop="true"/> - <!-- Allow anyone to own anything --> - <allow own="*"/> - </policy> - - <!-- This is included last so local configuration can override what's - in this standard file --> - <include ignore_missing="yes">session-local.conf</include> - - <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> - -</busconfig> |