[empathy: 8/14] Update libnotify dep when using GTK3
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 8/14] Update libnotify dep when using GTK3
- Date: Thu, 8 Jul 2010 12:36:44 +0000 (UTC)
commit c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Jul 8 09:46:44 2010 +0200
Update libnotify dep when using GTK3
Since 0.5.1 libnotify doesn't link on GTK+.
configure.ac | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7a1b9b9..1ebc23a 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]