[blam/blam-1.8.10] Remove NDesk's D-Bus library

[Carlos MartÃn Nieto <cmartin src gnome org>]

commit fb89c5ca3239eff21f8e492a1c355b276cbf348c
Author: Carlos MartÃn Nieto <carlos cmartin tk>
Date:   Sat May 12 19:22:49 2012 +0200

    Remove NDesk's D-Bus library
    
    Use Freedesktop's library only.

 configure.in       |   28 ++++++++--------------------
 src/Application.cs |    9 ++-------
 src/Makefile.am    |    9 ++-------
 3 files changed, 12 insertions(+), 34 deletions(-)
---
diff --git a/configure.in b/configure.in
index 84486d1..cac1eae 100644
--- a/configure.in
+++ b/configure.in
@@ -60,29 +60,17 @@ AC_ARG_WITH([dbus],
 	[],
 	with_dbus=auto
 )
-# In auto mode, prefer dbus-sharp
-PKG_CHECK_EXISTS([dbus-sharp-glib-1.0], DBUS_SHARP_SUPPORT=yes, DBUS_SHARP_SUPPORT=no)
-PKG_CHECK_EXISTS([ndesk-dbus-1.0], NDESK_DBUS_SUPPORT=yes, NDESK_DBUS_SUPPORT=no)
-if test "x$with_dbus" = "xauto"; then
-   if test "x$DBUS_SHARP_SUPPORT" = "xyes"; then
-      ENABLE_DBUS=$DBUS_SHARP_SUPPORT;ENABLE_DBUS_SHARP="yes"
-   else
-      ENABLE_DBUS=$NDESK_DBUS_SUPPORT;ENABLE_NDESK_DBUS="yes"
-   fi
-fi
+
+
+PKG_CHECK_MODULES(DBUS, dbus-sharp-glib-1.0, ENABLE_DBUS="yes", ENABLE_DBUS="no")
+AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" = "xyes")
+AC_SUBST(DBUS_LIBS)
+
 # If we found a package or the user told us
 if test "x$with_dbus" = "xyes"; then
-   if test "x$DBUS_SHARP_SUPPORT" = "xyes"; then
-      PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-glib-1.0, ENABLE_DBUS_SHARP="yes", ENABLE_DBUS_SHARP="no")
-      AC_SUBST(DBUS_LIBS, "$DBUS_SHARP_LIBS")
-   else
-      PKG_CHECK_MODULES(DBUS_NDESK, ndesk-dbus-glib-1.0, ENABLE_NDESK_DBUS="yes", ENABLE_NDESK_DBUS="no")
-      AC_SUBST(DBUS_LIBS, "$DBUS_NDESK_LIBS")
-   fi
+   PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-glib-1.0, ENABLE_DBUS_SHARP="yes", ENABLE_DBUS_SHARP="no")
 fi
-# Tell the code what we're using
-AM_CONDITIONAL(NDESK_DBUS, test "x$ENABLE_NDESK_DBUS" = "xyes")
-AM_CONDITIONAL(DBUS_SHARP, test "x$ENABLE_DBUS_SHARP" = "xyes")
+# Tell the code that we're using dbus
 
 #
 # Use libnotify is available
diff --git a/src/Application.cs b/src/Application.cs
index 9772a65..c55d9a1 100644
--- a/src/Application.cs
+++ b/src/Application.cs
@@ -19,13 +19,8 @@ using System.IO;
 using System.Text;
 using System.Runtime.InteropServices;
 using WebKit;
-#if DBUS_SHARP
 using DBus;
 using org.freedesktop.DBus;
-#elif NDESK_DBUS
-using NDesk.DBus;
-using org.freedesktop.DBus;
-#endif
 
 namespace Imendio.Blam {
 
@@ -35,7 +30,7 @@ namespace Imendio.Blam {
 		Channel
 	};
 
-#if NDESK_DBUS || DBUS_SHARP
+#if ENABLE_DBUS
     [Interface("org.gnome.feed.Reader")]
 #endif
     public interface IFeedReader {
@@ -43,7 +38,7 @@ namespace Imendio.Blam {
         void SetOnline(bool value);
     }
 
-#if NDESK_DBUS || DBUS_SHARP
+#if ENABLE_DBUS
     [Interface("org.gnome.Blam.Reader")]
 #endif
     public interface IBlamReader {
diff --git a/src/Makefile.am b/src/Makefile.am
index 3b1c603..cfbb0bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,13 +40,8 @@ BLAM_CSFILES = Application.cs \
 GENERATED_CSFILES = \
 	       Defines.cs
 
-if NDESK_DBUS
-FLAGS += -define:NDESK_DBUS
-ASSEMBLIES += $(DBUS_LIBS)
-endif
-
-if DBUS_SHARP
-FLAGS += -define:DBUS_SHARP
+if ENABLE_DBUS
+FLAGS += -define:ENABLE_DBUS
 ASSEMBLIES += $(DBUS_LIBS)
 endif