summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.j.ledkov@intel.com>2015-02-25 15:39:04 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-05-27 11:49:34 +0100
commitb2c61ca6ea2dd9ba62ebddc98fa295ee84ab3949 (patch)
tree162c3ec61692523c8e6806c9ac030f066965cef4 /configure.ac
parent4cbe3019c727380ec8734b7d2aa5a02e251d1489 (diff)
downloaddbus-b2c61ca6ea2dd9ba62ebddc98fa295ee84ab3949.tar.gz
Move session & system bus configuration to datadir, by default.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index fd0600ff..2f47f6b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1689,6 +1689,11 @@ DBUS_LIBEXECDIR="$EXPANDED_LIBEXECDIR"
AC_SUBST(DBUS_LIBEXECDIR)
AC_DEFINE_UNQUOTED(DBUS_LIBEXECDIR,"$DBUS_LIBEXECDIR", [Directory for installing the libexec binaries])
+#### Directory to source sysconfdir configuration from
+DBUS_SYSCONFDIR="$EXPANDED_SYSCONFDIR"
+AC_SUBST(DBUS_SYSCONFDIR)
+AC_DEFINE_UNQUOTED(DBUS_SYSCONFDIR,"$DBUS_SYSCONFDIR", [Directory to source sysconfdir configuration from])
+
#### Tell tests where to find certain stuff in builddir
DBUS_PWD=`pwd`
@@ -1848,6 +1853,8 @@ dbus/versioninfo.rc
dbus/dbus-arch-deps.h
bus/system.conf
bus/session.conf
+bus/legacy-config/system.conf
+bus/legacy-config/session.conf
bus/example-system-enable-stats.conf
bus/example-session-disable-stats.conf
bus/messagebus