[empathy: 27/65] Depend on gcr from gnome-keyring
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 27/65] Depend on gcr from gnome-keyring
- Date: Tue, 24 Aug 2010 13:28:43 +0000 (UTC)
commit 1c109373f9911de8f639cb6b355035478c0ab899
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri Aug 13 12:30:11 2010 +0200
Depend on gcr from gnome-keyring
configure.ac | 3 ++-
libempathy-gtk/Makefile.am | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a09b476..97ea195 100644
--- 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 fea658c..2284d13 100644
--- 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) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]