diff options
author | Colin Watson <cjwatson@debian.org> | 2012-10-31 10:35:38 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-10-31 10:35:38 +0000 |
commit | 301aad188299b268452af6b67261336c88f44ab1 (patch) | |
tree | 5ec34d429196f17ea6eb2205ca8f96da32b09dd1 /debian/rules | |
parent | 5cb249b209c170d817471b575b6d105094f137bc (diff) |
* Merge from Ubuntu:
- Add support for registering ConsoleKit sessions on login. (This is
currently enabled only when building for Ubuntu.)
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/rules b/debian/rules index af2172198..3dfbe6a66 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -77,6 +77,9 @@ confflags += --with-ssl-engine | |||
77 | ifeq ($(DEB_HOST_ARCH_OS),linux) | 77 | ifeq ($(DEB_HOST_ARCH_OS),linux) |
78 | confflags += --with-selinux | 78 | confflags += --with-selinux |
79 | endif | 79 | endif |
80 | ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) | ||
81 | confflags += --with-consolekit | ||
82 | endif | ||
80 | 83 | ||
81 | # The deb build wants xauth; the udeb build doesn't. | 84 | # The deb build wants xauth; the udeb build doesn't. |
82 | confflags += --with-xauth=/usr/bin/xauth | 85 | confflags += --with-xauth=/usr/bin/xauth |