[tomboy] ndesk-dbus is no longer optional on Linux

[Sanford Armstrong <sharm src gnome org>]

commit 5071d7902284617cf621022fc1a5de7062dddd0d
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Sun Jun 6 18:43:14 2010 -0700

    ndesk-dbus is no longer optional on Linux

 Tomboy/Addins/Tasque/Makefile.am |    2 --
 Tomboy/Makefile.am               |    7 ++-----
 configure.in                     |   11 ++---------
 data/Makefile.am                 |    2 --
 4 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/Tomboy/Addins/Tasque/Makefile.am b/Tomboy/Addins/Tasque/Makefile.am
index d420632..777fc25 100644
--- a/Tomboy/Addins/Tasque/Makefile.am
+++ b/Tomboy/Addins/Tasque/Makefile.am
@@ -16,7 +16,6 @@ ASSEMBLIES = 					\
 
 ADDIN_NAME = Tasque
 
-if ENABLE_DBUS
 TARGET = $(ADDIN_NAME).Addin.dll
 CSFILES = \
 	$(srcdir)/TasqueNoteAddin.cs \
@@ -35,7 +34,6 @@ addinsdir = $(pkglibdir)/addins
 addins_DATA = 			\
 	$(TARGET)		\
 	$(TARGET).mdb
-endif
 
 EXTRA_DIST =            	\
 	$(CSFILES) \
diff --git a/Tomboy/Makefile.am b/Tomboy/Makefile.am
index 6dae9b9..ae95e23 100644
--- a/Tomboy/Makefile.am
+++ b/Tomboy/Makefile.am
@@ -11,11 +11,6 @@ DBUS_CSFILES = 				\
 	$(srcdir)/RemoteControl.cs	\
 	$(srcdir)/RemoteControlProxy.cs
 
-if ENABLE_DBUS
-DBUS_CSFLAGS = -define:ENABLE_DBUS
-DBUS_USED_CSFILES = $(DBUS_CSFILES)
-endif
-
 OSX_CSFILES =					\
 	$(srcdir)/MacApplication.cs		\
 	$(srcdir)/MacFactory.cs			\
@@ -58,6 +53,8 @@ PANELAPPLET_CSFILES =			\
 	$(srcdir)/panelapplet/*.cs
 
 if ENABLE_GNOME
+DBUS_CSFLAGS = -define:ENABLE_DBUS
+DBUS_USED_CSFILES = $(DBUS_CSFILES)
 GNOME_USED_CSFILES = $(GNOME_CSFILES)
 
 if FIXED_PANELAPPLET
diff --git a/configure.in b/configure.in
index a8859c3..a96c6fb 100644
--- a/configure.in
+++ b/configure.in
@@ -153,10 +153,6 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$ENABLE_GNOME" != "xno")
 #
 # Use DBus to export our remote control if available.
 #
-AC_ARG_ENABLE(dbus, 
-	      [  --enable-dbus[[=no/yes]]    compile with dbus support [[default: yes]]],
-	      ENABLE_DBUS="$enableval", ENABLE_DBUS="yes")
-AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno")
 
 AC_ARG_WITH(dbus_service_dir, [  --with-dbus-service-dir=DIR            Where to install Tomboy's DBus service file.])
 AM_CONDITIONAL(WITH_DBUS_SERVICE_DIR, test "x$with_dbus_service_dir" != "x")
@@ -168,12 +164,9 @@ fi
 AC_SUBST(DBUS_SERVICE_DIR)
 
 #
-# Check for external NDesk DBus
+# Check for NDesk DBus
 #
-DBUS_LIBS=
-if test "x$ENABLE_DBUS" != "xno" ; then
-	PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3)
-fi
+PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3)
 AC_SUBST(DBUS_LIBS)
 
 #
diff --git a/data/Makefile.am b/data/Makefile.am
index 097b2ce..45ae0b6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,7 +28,6 @@ install-data-local:
 endif
 
 
-if ENABLE_DBUS
 dbusservicedir       = $(DBUS_SERVICE_DIR)
 dbusservice_in_files = org.gnome.Tomboy.service.in
 dbusservice_DATA     = $(dbusservice_in_files:.service.in=.service)
@@ -37,7 +36,6 @@ $(dbusservice_DATA): $(dbusservice_in_files) Makefile
 	sed -e "s|\ bindir\@|$(bindir)|g"	\
 	    -e "s|\ wrapper\@|tomboy|g"		\
 	    < $< > $@
-endif
 
 
 serverdir       = $(PANELAPPLET_SERVER_DIR)