Skip to content

Commit 0298f55

Browse files
committed
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
1 parent fc2371c commit 0298f55

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-conf
364364
have_dbus=no
365365
AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [disable usage of dbus-1 in tests]))
366366
AS_IF([test "x$enable_dbus" != "xno"], [
367-
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.3.2],
367+
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.9.18],
368368
[AC_DEFINE(HAVE_DBUS, 1, [Define if dbus-1 library is available]) have_dbus=yes],
369369
[have_dbus=no])
370370
AS_IF([test "x$have_dbus" = "xno" -a "x$enable_dbus" = "xyes"],
@@ -1451,7 +1451,7 @@ AC_SUBST(TTY_GID)
14511451
AC_ARG_WITH([dbuspolicydir],
14521452
AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),
14531453
[],
1454-
[with_dbuspolicydir=${sysconfdir}/dbus-1/system.d])
1454+
[with_dbuspolicydir=${datadir}/dbus-1/system.d])
14551455
AX_NORMALIZE_PATH([with_dbuspolicydir])
14561456

14571457
AC_ARG_WITH([dbussessionservicedir],

0 commit comments

Comments
 (0)