From 95cd1b57f9cd1e84bca22a0d9ff6046e11344b71 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Fri, 26 Jul 2013 15:33:54 +0200 Subject: Use gweather in GTK3 --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6ae299c7..ea5f6f29 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,6 @@ GLIB_REQUIRED=2.26 LIBMATEWNCK_REQUIRED=1.5.1 LIBMATE_MENU_REQUIRED=1.1.0 CAIRO_REQUIRED=1.0.0 -MATEWEATHER_REQUIRED=1.5.0 DBUS_GLIB_REQUIRED=0.80 DCONF_NEW_REQUIRED=0.13.4 DCONF_OLD_REQUIRED=0.10.0 @@ -84,10 +83,14 @@ case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 GTK_REQUIRED=2.19.7 LIBCANBERRA_API_VERSION= + WEATHER_LIB=mateweather + WEATHER_REQUIRED=1.5.0 ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=3.0.0 LIBCANBERRA_API_VERSION=-gtk3 + WEATHER_LIB=gweather + WEATHER_REQUIRED=3.8.0 ;; esac @@ -133,7 +136,7 @@ PKG_CHECK_MODULES(TZ, gio-$GTK_API_VERSION >= $GLIB_REQUIRED) AC_SUBST(TZ_CFLAGS) AC_SUBST(TZ_LIBS) -PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 dbus-glib-1 mateweather >= $MATEWEATHER_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED) +PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 dbus-glib-1 $WEATHER_LIB >= $WEATHER_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED) AC_SUBST(CLOCK_CFLAGS) AC_SUBST(CLOCK_LIBS) -- cgit v1.2.1