build-sys: revert dbus >= 1.9.18 requirement (#4924)

Instead, document the necessary step to utilize older dbus versions.

diff --git a/README b/README
index f7ccac8b0b00d92ebf79082796f0ef61dba24999..a5ce54bec7d17c9ba8dafd751bb5e5fb71d71897 100644 (file)
--- a/README
+++ b/README
@@ -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 a071bfa69e7c4db5a76e3d07f503a55f07ea4100..11bd46cbab02ecec3c1eb4108516c1a27389f9b0 100644 (file)
--- 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"],