Configure bits for geoclue

diff --git a/configure.ac b/configure.ac
index 0a3455835727a4d8de647fd701d4512784369188..8a85a75252a549135b07cced7cb79bb4dff017e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,10 @@ ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
 LIBCANBERRA_GTK_REQUIRED=0.4
-GEOCLUE_REQUIRED=0.11
 LIBCHAMPLAIN_REQUIRED=0.3.0
 LIBCHAMPLAIN_GTK_REQUIRED=0.3.0
 CLUTTER_GTK_REQUIRED=0.8.2
+GEOCLUE_REQUIRED=0.11
 
 # Use --enable-maintainer-mode to disabled deprecated symbols
 GNOME_MAINTAINER_MODE_DEFINES
@@ -240,7 +240,7 @@ if test "x$enable_location" != "xno"; then
       AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue])
    fi
 else
-   have_geoclue=no
+   have_geoclue="no"
 fi
 
 if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index c080c2e0337b08ae40b266badade225f88988396..999e565a5f3e5725b528d06e75acbed7422eb184 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS =                                           \
        $(LIBEMPATHYGTK_CFLAGS)                         \
        $(ENCHANT_CFLAGS)                               \
        $(LIBCHAMPLAIN_CFLAGS)                          \
+       $(GEOCLUE_CFLAGS)                               \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)
 
@@ -70,6 +71,7 @@ libempathy_gtk_la_LIBADD =                    \
        $(LIBEMPATHYGTK_LIBS)                   \
        $(ENCHANT_LIBS)                         \
        $(LIBCHAMPLAIN_LIBS)                    \
+       $(GEOCLUE_LIBS)                         \
        $(top_builddir)/libempathy/libempathy.la
 
 libempathy_gtk_la_LDFLAGS =                \