[banshee] build: linking against dbus-glib-1 is now mandatory (bgo#692374)

[Andrés Aragoneses <aaragoneses src gnome org>]

commit abdfd9c0786d159b7c24cbcff56eabd61f5d6b9a
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Tue Mar 18 01:10:06 2014 +0100

    build: linking against dbus-glib-1 is now mandatory (bgo#692374)
    
    The work-around for this bug was not applied successfully by some
    packagers because we didn't make the dependency mandatory. Now that
    gsettings branch is almost ready to be merged to master (which
    means this workaround would be reverted), it's good if we make sure
    that at least the last GConf-enabled versions don't suffer this bug.

 README                                             |    1 +
 build/m4/banshee/gconf.m4                          |    6 ++----
 configure.ac                                       |    1 -
 extras/create-release-notes                        |    1 +
 .../Banshee.Gui/GtkBaseClient.cs                   |    2 --
 src/Core/Banshee.ThickClient/Makefile.am           |    4 ----
 6 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/README b/README
index d74ae6e..97202e2 100644
--- a/README
+++ b/README
@@ -44,6 +44,7 @@ acceptable; higher versions are fine.
   * gkeyfile-sharp      0.1
   * libgpod-sharp       0.7.95
   * mono-upnp           0.1
+  * dbus-glib           0.80
 
 - Required at run-time:
   * udev
diff --git a/build/m4/banshee/gconf.m4 b/build/m4/banshee/gconf.m4
index fbf1ce6..d7388e1 100644
--- a/build/m4/banshee/gconf.m4
+++ b/build/m4/banshee/gconf.m4
@@ -12,9 +12,7 @@ AC_DEFUN([BANSHEE_CHECK_GCONF],
 
        # dbus-glib is needed for the workaround for bgo#692374
        PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.80, have_dbus_glib="yes", have_dbus_glib="no")
-       if test "x$have_dbus_glib" = "xyes"; then
-               AM_CONDITIONAL(HAVE_DBUS_GLIB, true)
-       else
-               AM_CONDITIONAL(HAVE_DBUS_GLIB, false)
+       if test "x$have_dbus_glib" = "xno"; then
+               AC_MSG_ERROR([Please install dbus-glib-1 development package or use --disable-gnome.])
        fi
 ])
diff --git a/configure.ac b/configure.ac
index 123154b..fc2f6c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,7 +124,6 @@ if test "x$enable_gnome" = "xyes"; then
        AM_CONDITIONAL(ENABLE_GNOME, true)
 else
        AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
-       AM_CONDITIONAL(HAVE_DBUS_GLIB, false)
        AM_CONDITIONAL(ENABLE_GNOME, false)
 fi
 
diff --git a/extras/create-release-notes b/extras/create-release-notes
index 6960e5e..06762fb 100755
--- a/extras/create-release-notes
+++ b/extras/create-release-notes
@@ -88,6 +88,7 @@ $features
        <li>gio-sharp &gt;= 2.99.1, gudev-sharp and gkeyfile-sharp</li>
        <li>libgpod-sharp &gt;= 0.7.95</li>
        <li>Mono.Upnp &gt;= 0.1</li>
+       <li>dbus-glib &gt;= 0.80</li>
 </ul>
 </li>
        <li>Run-time requirements for default feature stack:
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs 
b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
index e056768..baa1203 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@ -108,11 +108,9 @@ namespace Banshee.Gui
                 GLib.Thread.Init ();
             }
 
-#if HAVE_DBUS_GLIB
             // Using GConf from multiple threads causes crashes if multithreading is not initialized 
explictly in dbus
             // This is a workaround for bgo#692374
             dbus_g_thread_init ();
-#endif
 
             Gtk.Application.Init ();
 
diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
index ed2363b..ea2a8f8 100644
--- a/src/Core/Banshee.ThickClient/Makefile.am
+++ b/src/Core/Banshee.ThickClient/Makefile.am
@@ -3,10 +3,6 @@ TARGET = library
 ASSEMBLY_BUILD_FLAGS = -unsafe
 LINK = $(REF_BANSHEE_THICKCLIENT)
 
-if HAVE_DBUS_GLIB
-BUILD_DEFINES = "-define:HAVE_DBUS_GLIB"
-endif
-
 SOURCES =  \
        Banshee.Addins.Gui/AddinView.cs \
        Banshee.CairoGlyphs/BansheeLineLogo.cs \