[ekiga] Really remove all the last bits of dbus

[Eugen Dedu <ededu src gnome org>]

commit 4aeb269b24d554d9ab4abe3a9553e54a9aa3413c
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Mar 27 23:01:32 2012 +0200

    Really remove all the last bits of dbus
    
    Also a few obsolete versioned build dependencies

 .gitignore          |    6 +-
 Makefile.am         |    1 -
 configure.ac        |   17 +---
 doc/using_dbus.html |  301 ---------------------------------------------------
 src/Makefile.am     |   22 +----
 5 files changed, 5 insertions(+), 342 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f24015..e0c6234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,10 +46,6 @@ po/.intltool-merge-cache
 po/POTFILES
 po/stamp-it
 src/build-subdir-stamp
-src/dbus-helper/dbus-helper-stub.h
-src/dbus-helper/dbus-stub.h
-src/dbus-helper/org.ekiga.Ekiga.service
-src/dbus-helper/org.ekiga.Helper.service
 src/ekiga
 src/ekiga-config-tool
 src/ekiga-helper
@@ -58,4 +54,4 @@ stamp-h1
 help/*/*.mo
 
 lib/gmmarshallers.c
-lib/gmmarshallers.h
\ No newline at end of file
+lib/gmmarshallers.h
diff --git a/Makefile.am b/Makefile.am
index 279d6e5..ca8ab87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@ WIN32_DIST = \
 ### Extra dist
 EXTRA_DIST = \
 	$(DESKTOP_FILE)					        \
-        doc/using_dbus.html                                     \
 	gnome-doc-utils.make					\
 	FAQ							\
 	README							\
diff --git a/configure.ac b/configure.ac
index e397a1e..5a1bf78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,7 +195,7 @@ if test "x${gm_platform}" != "xmingw" ; then
 fi],enable_gconf=yes)
 
   if test "x$enable_gconf" = "xyes"; then
-    PKG_CHECK_MODULES([GCONF], [gconf-2.0 >= 2.6.0], [found_gconf=yes])
+    PKG_CHECK_MODULES([GCONF], [gconf-2.0], [found_gconf=yes])
     AM_GCONF_SOURCE_2
     AC_SUBST(GCONF_CFLAGS)
     AC_SUBST(GCONF_LIBS)
@@ -445,33 +445,23 @@ dnl ###############################
 dnl   DBUS Support
 dnl ###############################
 DBUS="disabled"
-DBUS_SERVICE="disabled"
 
 if test "x${gm_platform}" != "xmingw" ; then
   AC_ARG_ENABLE(dbus, AS_HELP_STRING([--enable-dbus],[enable DBUS support (default is enabled)]),
 [if test "x$enableval" = "xyes"; then
   enable_dbus=yes
 fi],enable_dbus=yes)
-  AC_ARG_ENABLE(dbus-service, AS_HELP_STRING([--enable-dbus-service],[enable DBUS service installation (default is enabled)]),
-[if test "x$enableval" = "xyes"; then
-  enable_dbus_service=yes
-fi],enable_dbus_service=yes)
 
   if test "x$enable_dbus" = "xyes"; then
-    PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.36 dbus-glib-1 >= 0.36], [found_dbus=yes])
+    PKG_CHECK_MODULES([DBUS], [dbus-1 dbus-glib-1], [found_dbus=yes])
     AC_SUBST(DBUS_CFLAGS)
     AC_SUBST(DBUS_LIBS)
     DBUS="enabled"
     AC_DEFINE(HAVE_DBUS,1,[DBUS support])
-
-    if test "x$found_dbus" = "xyes" -a "x$enable_dbus_service" = "xyes"; then
-      DBUS_SERVICE="enabled"
-    fi
   fi
 fi
 
 AM_CONDITIONAL(HAVE_DBUS, test "x$found_dbus" = "xyes")
-AM_CONDITIONAL(INSTALL_DBUS_SERVICE, test "x$DBUS_SERVICE" = "xenabled")
 
 
 dnl ###############################
@@ -501,7 +491,7 @@ if test "x${gm_platform}" != "xmingw" ; then
 fi],enable_avahi=yes)
 
   if test "x$enable_avahi" = "xyes"; then
-    PKG_CHECK_MODULES([AVAHI], [avahi-client >= 0.6 avahi-glib >= 0.6], [found_avahi=yes])
+    PKG_CHECK_MODULES([AVAHI], [avahi-client avahi-glib], [found_avahi=yes])
     AC_SUBST(AVAHI_CFLAGS)
     AC_SUBST(AVAHI_LIBS)
     AVAHI="enabled"
@@ -892,7 +882,6 @@ echo "                   H.323 support  :  $H323"
 echo ""
 if test "x${gm_platform}" != "xmingw" ; then
 echo "                    DBUS support  :  $DBUS"
-echo "            DBUS service support  :  $DBUS_SERVICE"
 echo "             mDNS/DNS-SD support  :  $AVAHI"
 fi
 echo ""
diff --git a/src/Makefile.am b/src/Makefile.am
index a8d2b2f..01c6e23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,7 @@ INCLUDES = \
 	-I$(top_srcdir)/lib/engine/gui/gtk-core		\
 	-I$(top_srcdir)/lib/engine/components/opal	\
 	-I$(top_srcdir)/src				\
-	-I$(top_srcdir)/src/dbus-helper/		\
-	-I$(top_srcdir)/src/gui/			\
-	-I$(top_builddir)/src/dbus-helper/
+	-I$(top_srcdir)/src/gui
 
 BUILT_SOURCES = src/revision.h
 
@@ -94,22 +92,6 @@ ekiga_SOURCES +=                   		\
 endif
 
 
-build-subdir-stamp:
-	test -d dbus-helper || mkdir dbus-helper
-	touch build-subdir-stamp
-
-if INSTALL_DBUS_SERVICE
-
-%.service: %.service.in
-	$(mkdir_p) dbus-helper # this is ugly...
-	sed -e "s#\ bindir\@# bindir@#" $< > $@
-
-servicedir = $(datadir)/dbus-1/services
-service_DATA = dbus-helper/org.ekiga.Ekiga.service dbus-helper/org.ekiga.Helper.service
-service_in_files = $(service_DATA:.service=.service.in)
-
-endif
-
 .rc.o:
 	$(RC) $< -o $@ -I $(top_srcdir)
 
@@ -139,8 +121,6 @@ endif
 
 EXTRA_DIST = \
 	$(service_in_files)		\
-	dbus-helper/dbus-stub.xml	\
-	dbus-helper/dbus-helper-stub.xml \
 	ekiga-debug-analyser
 
 CLEANFILES = \