[gnome-settings-daemon] datetime: Use DBus interface file from geoclue tarball

[Kalev Lember <klember src gnome org>]

commit 11f00033051f1a5e15f1fd29479f5a9020b1c937
Author: Kalev Lember <kalevlember gmail com>
Date:   Tue Sep 3 22:02:09 2013 +0200

    datetime: Use DBus interface file from geoclue tarball
    
    GeoClue 1.99.3 ships its DBus interface XML file in the tarball and
    exposes it through pkgconfig, so we can get rid of the copy in
    gnome-settings-daemon.
    
    This is also needed to keep up with the GeoClue DBus API changes between
    1.99.2 and 1.99.3.

 configure.ac                           |    6 ++++++
 plugins/datetime/Makefile.am           |    5 ++---
 plugins/datetime/geoclue-interface.xml |   25 -------------------------
 3 files changed, 8 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bf7fd36..7cc96b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,6 +260,12 @@ PKG_CHECK_MODULES(DATETIME,
        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
 )
 
+GEOCLUE_DBUS_INTERFACE_XML=`pkg-config --variable=dbus_interface geoclue-2.0`
+if test "x$GEOCLUE_DBUS_INTERFACE_XML" = "x"; then
+       AC_MSG_ERROR([Cannot find dbus_interface variable in geoclue-2.0.pc])
+fi
+AC_SUBST(GEOCLUE_DBUS_INTERFACE_XML)
+
 dnl ---------------------------------------------------------------------------
 dnl - wacom (disabled for s390/s390x and non Linux platforms)
 dnl ---------------------------------------------------------------------------
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index 4232a65..9d5e37e 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -1,12 +1,12 @@
 plugin_name = datetime
 
 geoclue.c: geoclue.h
-geoclue.h: Makefile.am geoclue-interface.xml
+geoclue.h: Makefile.am $(GEOCLUE_DBUS_INTERFACE_XML)
        gdbus-codegen                                           \
                --interface-prefix org.freedesktop.GeoClue2     \
                --generate-c-code geoclue                       \
                --c-namespace Geoclue                           \
-               $(srcdir)/geoclue-interface.xml
+               $(GEOCLUE_DBUS_INTERFACE_XML)
 
 timedated.c: timedated.h
 timedated.h: Makefile.am timedated1-interface.xml
@@ -98,7 +98,6 @@ plugin_in_files = \
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST =                           \
-       geoclue-interface.xml           \
        timedated1-interface.xml        \
        $(plugin_in_files)