summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-27 13:13:41 +0100
committerStefano Karapetsas <[email protected]>2013-10-27 13:13:41 +0100
commitc8b0f053ed2bfd86663201b3f5f7e3b42420ee6a (patch)
tree2720cd5a9af2cd05ba8c956843fd8f263a1df0a5
parent275dfc749eb988b3316b32e0a74dad2d7c92936f (diff)
downloadmate-notification-daemon-c8b0f053ed2bfd86663201b3f5f7e3b42420ee6a.tar.bz2
mate-notification-daemon-c8b0f053ed2bfd86663201b3f5f7e3b42420ee6a.tar.xz
Update configure for GTK3 support
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 171e09d..fd0c32a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,10 +96,12 @@ case "$with_gtk" in
2.0) GTK_API_VERSION=2.0
GTK_REQUIRED=2.18.0
LIBWNCK_API_VERSION=1.0
+ LIBCANBERRA_API_VERSION=
;;
3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=3.0.0
LIBWNCK_API_VERSION=3.0
+ LIBCANBERRA_API_VERSION=3
;;
esac
@@ -124,7 +126,7 @@ pkg_modules="
$GMODULE_ADD \
dbus-1 >= $REQ_DBUS_VERSION, \
dbus-glib-1 >= $REQ_DBUS_VERSION, \
- libcanberra-gtk >= $REQ_LIBCANBERRA_GTK_VERSION, \
+ libcanberra-gtk$LIBCANBERRA_API_VERSION >= $REQ_LIBCANBERRA_GTK_VERSION, \
libwnck-$LIBWNCK_API_VERSION \
x11 \
"
@@ -140,7 +142,7 @@ AC_SUBST(NOTIFICATION_CAPPLET_CFLAGS)
AC_SUBST(NOTIFICATION_CAPPLET_LIBS)
gdk_modules="
- gdk-2.0 >= $GTK_REQUIRED, \
+ gdk-$GTK_API_VERSION >= $GTK_REQUIRED, \
gdk-pixbuf-2.0 >= $GTK_REQUIRED \
"
PKG_CHECK_MODULES(GDK, $gdk_modules, have_gdk=yes,