diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 0ebbe036..f610cc46 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mate-panel], [1.27.0], [https://github.com/mate-desktop/mate-panel/issues], +AC_INIT([mate-panel], [1.29.0], [https://github.com/mate-desktop/mate-panel/issues], [mate-panel], [https://mate-desktop.org]) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar -Wno-portability check-news]) @@ -53,16 +53,15 @@ fi LT_LIB_M -LIBMATE_DESKTOP_REQUIRED=1.17.0 +LIBMATE_DESKTOP_REQUIRED=1.28.2 GDK_PIXBUF_REQUIRED=2.26.0 PANGO_REQUIRED=1.15.4 GLIB_REQUIRED=2.50.0 LIBMATE_MENU_REQUIRED=1.21.0 CAIRO_REQUIRED=1.0.0 DCONF_REQUIRED=0.13.4 -GTK_REQUIRED=3.22.0 -LIBWNCK_REQUIRED=3.4.6 -LIBWNCK_PREVIEWS_OPTIONAL=3.32.0 +GTK_REQUIRED=3.24.0 +LIBWNCK_REQUIRED=43.0 WEATHER_REQUIRED=1.17.0 dnl pkg-config dependency checks @@ -88,16 +87,9 @@ PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-3.0 >= $GTK_REQUIRED mate-desktop-2.0 AC_SUBST(NOTIFICATION_AREA_CFLAGS) AC_SUBST(NOTIFICATION_AREA_LIBS) -# Check if we have a version of libwnck that allows for window previews -PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >= $LIBWNCK_PREVIEWS_OPTIONAL mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED, have_window_previews=yes, [ - PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED, have_window_previews=no) -]) +PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED) AC_SUBST(WNCKLET_CFLAGS) AC_SUBST(WNCKLET_LIBS) -AM_CONDITIONAL(HAVE_WINDOW_PREVIEWS, [test "x$have_window_previews" = "xyes"]) -if test "x$have_window_previews" = "xyes"; then - AC_DEFINE([HAVE_WINDOW_PREVIEWS], 1, [Defined when using a version of libwnck that provides window-list previews]) -fi AC_CHECK_HEADERS(langinfo.h) AC_CHECK_FUNCS(nl_langinfo) @@ -110,6 +102,27 @@ PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib AC_SUBST(CLOCK_CFLAGS) AC_SUBST(CLOCK_LIBS) +# Check for Evolution Data Server support for calendar integration +AC_ARG_ENABLE([eds], + AS_HELP_STRING([--enable-eds], [Enable Evolution Data Server calendar integration @<:@default=auto@:>@]), + [enable_eds=$enableval], + [enable_eds=auto]) + +if test "x$enable_eds" != "xno"; then + PKG_CHECK_MODULES(EDS, [libecal-2.0 >= 3.33.2 libedataserver-1.2 >= 3.5.3], have_eds=yes, have_eds=no) + if test "x$have_eds" = "xyes"; then + AC_DEFINE(HAVE_EDS, 1, [Define if evolution-data-server is available]) + elif test "x$enable_eds" = "xyes"; then + AC_MSG_ERROR([EDS support requested but evolution-data-server development libraries not found]) + fi +else + have_eds=no +fi + +AM_CONDITIONAL(HAVE_EDS, test "x$have_eds" = "xyes") +AC_SUBST(EDS_CFLAGS) +AC_SUBST(EDS_LIBS) + # Make it possible to compile the applets in-process PANEL_INPROCESS_NONE= PANEL_INPROCESS_ALL= @@ -381,6 +394,7 @@ echo " Wayland support: ${have_wayland} X11 support: ${have_x11} XRandr support: ${have_randr} + Evolution Data Server support: ${have_eds} Build introspection support: ${found_introspection} Build gtk-doc documentation: ${enable_gtk_doc} |