aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-08 15:46:44 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-08 17:40:31 +0800
commitc98757d4c4dff4e7f6cea083e4bcf8ac07e93a08 (patch)
tree60544bfec126962e61397fa60818e21f1c8e1804
parent9a1f7eef53c664ec9a81f51bfe9a7ec5659b8c6c (diff)
downloadgsoc2013-empathy-c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08.tar
gsoc2013-empathy-c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08.tar.gz
gsoc2013-empathy-c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08.tar.bz2
gsoc2013-empathy-c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08.tar.lz
gsoc2013-empathy-c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08.tar.xz
gsoc2013-empathy-c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08.tar.zst
gsoc2013-empathy-c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08.zip
Update libnotify dep when using GTK3
Since 0.5.1 libnotify doesn't link on GTK+.
-rw-r--r--configure.ac5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7a1b9b9d6..1ebc23a85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ GTK_REQUIRED=2.21.2
KEYRING_REQUIRED=2.22
LIBCANBERRA_GTK_REQUIRED=0.4
LIBNOTIFY_REQUIRED=0.4.4
+LIBNOTIFY_REQUIRED_GTK3=0.5.1
TELEPATHY_GLIB_REQUIRED=0.11.7
TELEPATHY_LOGGER=0.1.2
UNIQUE_REQUIRED=1.1.2
@@ -161,8 +162,6 @@ PKG_CHECK_MODULES(EMPATHY,
x11
])
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
-
# -----------------------------------------------------------
# GTK+
# -----------------------------------------------------------
@@ -178,6 +177,7 @@ if test "x$enable_gtk3" != "xno"; then
# GTK3 specific deps
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
fi
# ...if not use GTK+2
@@ -187,6 +187,7 @@ if test "x$enable_gtk3" == "xno"; then
# GTK2 specific deps
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
# Enable GSEAL checks if needed
if test $USE_MAINTAINER_MODE = yes; then