diff options
| author | Mike Gilbert <floppymaster@gmail.com> | 2016-12-20 04:53:53 -0500 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-12-20 10:53:53 +0100 |
| commit | ecf4f0a8def58f38a9256b6616efc237706da08e (patch) | |
| tree | bf1be1d7c0906619523944cb4c33ef3ca672d3cf | |
| parent | 1bb67eb21abff835aa12429f4bc93428034eb34b (diff) | |
build-sys: revert dbus >= 1.9.18 requirement (#4924)
Instead, document the necessary step to utilize older dbus versions.
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -142,7 +142,9 @@ REQUIREMENTS: dependencies: util-linux >= v2.27.1 required - dbus >= 1.9.18 (strictly speaking optional, but recommended) + dbus >= 1.4.0 (strictly speaking optional, but recommended) + NOTE: If using dbus < 1.9.18, you should override the default + policy directory (--with-dbuspolicydir=/etc/dbus-1/system.d). dracut (optional) PolicyKit (optional) diff --git a/configure.ac b/configure.ac index a071bfa69e..11bd46cbab 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.9.18], + PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.3.2], [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"], |