Depend on gcr from gnome-keyring

diff --git a/configure.ac b/configure.ac
index a09b476e4538ad91c9e98bd483df65fd6668a05c..97ea195ff335cc52683dece27d30af70e3d85af9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ FOLKS_REQUIRED=0.1.13
 GCONF_REQUIRED=1.2.0
 GLIB_REQUIRED=2.25.9
 GTK_REQUIRED=2.21.2
-KEYRING_REQUIRED=2.22
+KEYRING_REQUIRED=2.26.0
 LIBCANBERRA_GTK_REQUIRED=0.4
 LIBNOTIFY_REQUIRED=0.4.4
 LIBNOTIFY_REQUIRED_GTK3=0.5.1
@@ -150,6 +150,7 @@ PKG_CHECK_MODULES(EMPATHY,
    folks >= $FOLKS_REQUIRED
    folks-telepathy >= $FOLKS_REQUIRED
    gconf-2.0 >= $GCONF_REQUIRED
+   gcr-0 >= $KEYRING_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-keyring-1 >= $KEYRING_REQUIRED

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index fea658c0dfd152e95d2ce26c0e5c418e04a72b45..2284d133866b9259f858de9a133610e2be91eae1 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS =                                           \
        -I$(top_srcdir)                                 \
        -DDATADIR=\""$(datadir)"\"                      \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
+       -DGCR_API_SUBJECT_TO_CHANGE                     \
        $(EMPATHY_CFLAGS)                               \
        $(GTK_CFLAGS)                           \
        $(LIBNOTIFY_CFLAGS)                             \