[gnome-user-share] build: Require dbus >= 1.1.1

[Bastien Nocera <hadess src gnome org>]

commit f7a8839a9510bc1cd6777d9bce6823ffdba113f7
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Feb 21 11:00:30 2013 +0100

    build: Require dbus >= 1.1.1
    
    Released in 2007, and remove the unused $DBUS_MODULES variable.

 configure.ac |    8 +-------
 src/http.c   |   11 -----------
 2 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 657ffb3..c707926 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,13 +54,7 @@ fi
 
 AC_SUBST(HTTPD)
 
-PKG_CHECK_EXISTS(dbus-1 >= 1.1.1, have_dbus_1_1=true, have_dbus_1_1=false)
-if $have_dbus_1_1 ; then
-   DBUS_MODULES=dbus-1
-   AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
-fi
-
-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 >= 2.26 gtk+-3.0 dbus-glib-1 libnotify 
libcanberra-gtk3 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.91.5)
+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 >= 2.26 gtk+-3.0 dbus-1 >= 1.1.1 dbus-glib-1 
libnotify libcanberra-gtk3 gnome-bluetooth-1.0 >= 2.91.5)
 AC_SUBST(USER_SHARE_CFLAGS)
 AC_SUBST(USER_SHARE_LIBS)
 
diff --git a/src/http.c b/src/http.c
index 763a201..a67aef0 100644
--- a/src/http.c
+++ b/src/http.c
@@ -26,10 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <X11/Xlib.h>
-
-#ifdef HAVE_DBUS_1_1
 #include <dbus/dbus.h>
-#endif
 
 #include <stdarg.h>
 #include <string.h>
@@ -53,10 +50,7 @@
 /* From avahi-common/domain.h */
 #define AVAHI_LABEL_MAX 64
 
-#ifdef HAVE_DBUS_1_1
 static char *dbus_session_id;
-#endif
-
 static pid_t httpd_pid = 0;
 
 static int
@@ -151,7 +145,6 @@ get_share_name (void)
        return name;
 }
 
-#ifdef HAVE_DBUS_1_1
 static void
 init_dbus() {
        /* The only use we make of D-BUS is to fetch the session BUS ID so we can export
@@ -186,7 +179,6 @@ init_dbus() {
        dbus_connection_close(connection);
        dbus_connection_unref(connection);
 }
-#endif
 
 static void
 ensure_conf_dir (void)
@@ -466,10 +458,7 @@ http_down (void)
 gboolean
 http_init (void)
 {
-#ifdef HAVE_DBUS_1_1
        init_dbus();
-#endif 
-
        return TRUE;
 }