aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-01 16:10:07 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-01 18:00:05 +0800
commit304c189c78f86299c80beb0edbc33d0d970cf458 (patch)
tree18ec665862e8f0deb3d598b0a79d38bee73b4fcf
parent69a4acc92a7891595c624e89f2d5d0fc4e9327ff (diff)
downloadgsoc2013-empathy-304c189c78f86299c80beb0edbc33d0d970cf458.tar
gsoc2013-empathy-304c189c78f86299c80beb0edbc33d0d970cf458.tar.gz
gsoc2013-empathy-304c189c78f86299c80beb0edbc33d0d970cf458.tar.bz2
gsoc2013-empathy-304c189c78f86299c80beb0edbc33d0d970cf458.tar.lz
gsoc2013-empathy-304c189c78f86299c80beb0edbc33d0d970cf458.tar.xz
gsoc2013-empathy-304c189c78f86299c80beb0edbc33d0d970cf458.tar.zst
gsoc2013-empathy-304c189c78f86299c80beb0edbc33d0d970cf458.zip
the GTK3 flavour of gcr is gcr-3 (#627916)
-rw-r--r--configure.ac5
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 8df9b7ba6..a4c9f7fcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,10 +204,7 @@ 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)
+ PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
else
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)