Check for gcr-1 when building against GTK+ 3 (GNOME bug #628092)

diff --git a/configure.ac b/configure.ac
index 48dd5ea48fdd999f2ad3a7e73724f2217ece722d..6a7ea462a8ae60487aa01a10643747a4c5334d34 100644 (file)
--- 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 d81b972538301265ecd10792cf6331b4d320b8e2..1cc65532c65e5d7e776dde85c15956d7cc33ebf9 100644 (file)
--- 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