aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@0d.be>2010-08-30 22:59:33 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-30 22:59:33 +0800
commit32905fa2cb9fb3419f50c5894ac7507fb9330f8f (patch)
tree976ffd506329515dca5102d7dc53ca85b2749f8a
parent5ea7f6cfbc591afac428bffbff513ccb77db3d63 (diff)
downloadgsoc2013-empathy-32905fa2cb9fb3419f50c5894ac7507fb9330f8f.tar
gsoc2013-empathy-32905fa2cb9fb3419f50c5894ac7507fb9330f8f.tar.gz
gsoc2013-empathy-32905fa2cb9fb3419f50c5894ac7507fb9330f8f.tar.bz2
gsoc2013-empathy-32905fa2cb9fb3419f50c5894ac7507fb9330f8f.tar.lz
gsoc2013-empathy-32905fa2cb9fb3419f50c5894ac7507fb9330f8f.tar.xz
gsoc2013-empathy-32905fa2cb9fb3419f50c5894ac7507fb9330f8f.tar.zst
gsoc2013-empathy-32905fa2cb9fb3419f50c5894ac7507fb9330f8f.zip
Check for gcr-1 when building against GTK+ 3 (GNOME bug #628092)
-rw-r--r--configure.ac6
-rw-r--r--libempathy-gtk/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 48dd5ea48..6a7ea462a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,6 @@ 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
@@ -205,6 +204,10 @@ if test "x$have_gtk3" == "xyes"; then
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
+ # gcr-1 doesn't exist at the moment, and could even be named differently
+ # once it exists, but checking for it makes sure configure abort, instead
+ # of allowing to build an empathy binary linked to both GTK+ 2 and 3.
+ PKG_CHECK_MODULES(GCR, gcr-1 >= $KEYRING_REQUIRED)
else
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
@@ -212,6 +215,7 @@ else
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
+ PKG_CHECK_MODULES(GCR, gcr-0 >= $KEYRING_REQUIRED)
# Enable GSEAL checks if needed
if test $USE_MAINTAINER_MODE = yes; then
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index d81b97253..1cc65532c 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
$(ENCHANT_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(GEOCLUE_CFLAGS) \
+ $(GCR_CFLAGS) \
$(MEEGO_CFLAGS) \
$(WEBKIT_CFLAGS) \
$(WARN_CFLAGS) \
@@ -170,6 +171,7 @@ libempathy_gtk_la_LIBADD = \
$(ENCHANT_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(GEOCLUE_LIBS) \
+ $(GCR_LIBS) \
$(MEEGO_LIBS) \
$(WEBKIT_LIBS) \
$(top_builddir)/libempathy/libempathy.la