[Xfce4-commits] [xfce/xfdesktop] 05/06: Always depend on dbus-glib (Bug 10745)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit f0e5154a5ff15f4d12d08cbc7f044641fa5b768e
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Fri Mar 14 19:27:27 2014 +0300

    Always depend on dbus-glib (Bug 10745)
    
    Thanks to Samuli Suominen for reporting the issue and proposing
    the fix.
---
 README          |    2 +-
 configure.ac.in |    9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 0050aa1..a502798 100644
--- a/README
+++ b/README
@@ -23,9 +23,9 @@ MINIMUM REQUIREMENTS
 * libwnck 2.30
 * libexo 0.6
 * xfconf 4.10
+* dbus-glib 0.84
 * garcon 0.1.2 (optional; required for apps menu)
 * thunar 1.2 (optional; required for file icons)
-* dbus-glib 0.34  (optional; required for file icons)
 * tumbler 1.6 (optional; enables thumbnail previews for file icons)
 
 
diff --git a/configure.ac.in b/configure.ac.in
index d162dac..8c15fe7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -94,6 +94,7 @@ XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
+XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],
                   [libxfce4util_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],
@@ -131,14 +132,6 @@ else
 fi
 
 if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
-    dnl here i shall abuse the XDT_CHECK_PACKAGE macro
-    XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [
-echo "*** Optional package dbus-glib-1 was either not found on your system"
-echo "*** or is too old.  Please install or upgrade to at least version"
-echo "*** dbus_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix.  File/launcher icons will be disabled."
-])
     enable_file_icons="no"
     if test "x$DBUS_VERSION" != "x"; then
         enable_file_icons="yes"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.