summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-12-12 19:16:33 +0100
committerLennart Poettering <lennart@poettering.net>2016-12-15 16:06:46 +0100
commit0298f55bb03926f1b4cc7abb10ab4f99bac3b091 (patch)
tree110d256e611d7160d3ca7fbc42eed8be0a0c5188 /configure.ac
parentfc2371c7b1b41c2e3c8123317933322173f8abae (diff)
build-sys: stop placing D-Bus policy below /etc
Let's start placing our D-Bus policy files in /usr rather than /etc. D-Bus supports this since 1.9.18, and moving our files over means we continue to work even if /etc is flushed out entirely (for example if systemd-nspawn's --volatile= switch is used). Since 1.9.18 was released summer 2015 it should be fine to require a newer version like this for our builds. https://lists.freedesktop.org/archives/dbus/2015-July/016746.html
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 32febcabe9..4a05702094 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,7 +364,7 @@ m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-conf
have_dbus=no
AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [disable usage of dbus-1 in tests]))
AS_IF([test "x$enable_dbus" != "xno"], [
- PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.3.2],
+ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.9.18],
[AC_DEFINE(HAVE_DBUS, 1, [Define if dbus-1 library is available]) have_dbus=yes],
[have_dbus=no])
AS_IF([test "x$have_dbus" = "xno" -a "x$enable_dbus" = "xyes"],
@@ -1451,7 +1451,7 @@ AC_SUBST(TTY_GID)
AC_ARG_WITH([dbuspolicydir],
AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),
[],
- [with_dbuspolicydir=${sysconfdir}/dbus-1/system.d])
+ [with_dbuspolicydir=${datadir}/dbus-1/system.d])
AX_NORMALIZE_PATH([with_dbuspolicydir])
AC_ARG_WITH([dbussessionservicedir],