[evolution/evolution-3-12] Bug 739364 - Drop references to geoclue

[Milan Crha <mcrha src gnome org>]

commit 383faa02c79a8ff47d2a5b62dc029c67cafa0c0f
Author: Milan Crha <mcrha redhat com>
Date:   Fri Oct 31 17:34:09 2014 +0100

    Bug 739364 - Drop references to geoclue

 addressbook/gui/widgets/e-contact-map.c |    2 --
 configure.ac                            |    9 +++------
 2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-contact-map.c b/addressbook/gui/widgets/e-contact-map.c
index 5ae1fbd..fde0e8b 100644
--- a/addressbook/gui/widgets/e-contact-map.c
+++ b/addressbook/gui/widgets/e-contact-map.c
@@ -26,8 +26,6 @@
 
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
-#include <geoclue/geoclue-address.h>
-#include <geoclue/geoclue-position.h>
 #include <geocode-glib/geocode-glib.h>
 
 #include <clutter/clutter.h>
diff --git a/configure.ac b/configure.ac
index 6517cf8..dfb8d54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ m4_define([libpst_minimum_version], [0.6.54])
 dnl Optional Packages
 m4_define([champlain_minimum_version], [0.12])
 m4_define([clutter_gtk_minimum_version], [0.90])
-m4_define([geoclue_minimum_version], [0.12.0])
 m4_define([geocode_glib_minimum_version], [3.10])
 m4_define([gladeui_minimum_version], [3.10.0])
 m4_define([gweather_minimum_version], [3.8])
@@ -215,7 +214,6 @@ case "$host" in
        DL_LIB=''
        SOFTOKN3_LIB=''
        CHAMPLAIN_REQUIREMENT=''
-       GEOCLUE_REQUIREMENT=''
        ;;
 *openbsd*|*freebsd*)
        os_win32=no
@@ -1276,7 +1274,7 @@ fi
 AM_CONDITIONAL(ENABLE_WEATHER, [test "x$enable_weather" != "xno"])
 
 dnl ********************************************************************
-dnl maps in contacts preview requires champlain-gtk, geoclue and clutter
+dnl maps in contacts preview requires champlain-gtk and clutter
 dnl ********************************************************************
 AC_ARG_ENABLE([contact-maps],
        [AS_HELP_STRING([--enable-contact-maps],
@@ -1298,11 +1296,10 @@ if test "x$enable_contact_maps" = "xyes"; then
 
        PKG_CHECK_MODULES(
                [GEO],
-               [geoclue >= geoclue_minimum_version
-                geocode-glib-1.0 >= geocode_glib_minimum_version],,
+               [geocode-glib-1.0 >= geocode_glib_minimum_version],,
                [AC_MSG_ERROR([
 
-       geoclue and/or geocode-glib not found.
+       geocode-glib not found.
 
        If you want to disable the contact maps feature,
        please append --disable-contact-maps to configure.