]> git.0d.be Git - empathy.git/commitdiff
the GTK3 flavour of gcr is gcr-3 (#627916)
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 1 Sep 2010 08:10:07 +0000 (10:10 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 1 Sep 2010 10:00:05 +0000 (12:00 +0200)
configure.ac

index 8df9b7ba60e8c03f5a9eaf0651aaf96676d3ccb6..a4c9f7fcb3f788a89e0aada2dd7d72c05a42278d 100644 (file)
@@ -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)