]> git.0d.be Git - empathy.git/commitdiff
Update libnotify dep when using GTK3
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 8 Jul 2010 07:46:44 +0000 (09:46 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 8 Jul 2010 09:40:31 +0000 (11:40 +0200)
Since 0.5.1 libnotify doesn't link on GTK+.

configure.ac

index 7a1b9b9d607e4a51c29ad43438bf1744b29fe682..1ebc23a85c9582ebf4a2ab1c890209c5a9d316cc 100644 (file)
@@ -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