summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac11
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 55135948..a4a2d9f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ LIBMATE_DESKTOP_REQUIRED=1.5.0
GDK_PIXBUF_REQUIRED=2.7.1
PANGO_REQUIRED=1.15.4
GLIB_REQUIRED=2.26
-LIBMATEWNCK_REQUIRED=1.5.1
LIBMATE_MENU_REQUIRED=1.1.0
CAIRO_REQUIRED=1.0.0
DBUS_GLIB_REQUIRED=0.80
@@ -82,6 +81,8 @@ AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in
2.0) GTK_API_VERSION=2.0
GTK_REQUIRED=2.19.7
+ LIBWNCK_API_VERSION=1.0
+ LIBWNCK_REQUIRED=2.30.0
LIBCANBERRA_API_VERSION=
WEATHER_LIB=mateweather
WEATHER_REQUIRED=1.5.0
@@ -89,7 +90,9 @@ case "$with_gtk" in
3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=3.0.0
LIBCANBERRA_API_VERSION=3
- WEATHER_LIB=gweather
+ LIBWNCK_API_VERSION=3.0
+ LIBWNCK_REQUIRED=3.0.0
+ WEATHER_LIB=gweather-3.0
WEATHER_REQUIRED=3.8.0
;;
esac
@@ -125,14 +128,14 @@ PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
AC_SUBST(NOTIFICATION_AREA_CFLAGS)
AC_SUBST(NOTIFICATION_AREA_LIBS)
-PKG_CHECK_MODULES(WNCKLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libmatewnck >= $LIBMATEWNCK_REQUIRED)
+PKG_CHECK_MODULES(WNCKLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libwnck-$LIBWNCK_API_VERSION >= $LIBWNCK_REQUIRED)
AC_SUBST(WNCKLET_CFLAGS)
AC_SUBST(WNCKLET_LIBS)
AC_CHECK_HEADERS(langinfo.h)
AC_CHECK_FUNCS(nl_langinfo)
-PKG_CHECK_MODULES(TZ, gio-$GTK_API_VERSION >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(TZ, gio-2.0 >= $GLIB_REQUIRED)
AC_SUBST(TZ_CFLAGS)
AC_SUBST(TZ_LIBS)