diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-29 22:52:15 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-29 23:18:00 +0800 |
| commit | 125b36b99c39afa283f901785343f8bdecfda5e3 (patch) | |
| tree | 690309c94befa905207c868e397c984121915c47 /configure.ac | |
| parent | 59aa704f310e7eeb11089022af7a706faf49a2c6 (diff) | |
| download | gsoc2013-evolution-125b36b99c39afa283f901785343f8bdecfda5e3.tar.gz gsoc2013-evolution-125b36b99c39afa283f901785343f8bdecfda5e3.tar.zst gsoc2013-evolution-125b36b99c39afa283f901785343f8bdecfda5e3.zip | |
Require gweather >= 2.90.0 when building against gtk+-3.0.
Note, at this moment libgweather-2.90.0 doesn't exist. The version
requirement is a guess. The tarball should appear "any minute now".
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 6c02684d1c..ae6659a6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -51,11 +51,9 @@ m4_define([nm_minimum_version],[0.7]) m4_define([champlain_minimum_version], [0.4]) m4_define([geoclue_minimum_version], [0.11.1]) m4_define([clutter_gtk_minimum_version], [0.10.0]) -m4_define([gweather_minimum_version], [2.25.3]) m4_define([gtkimageview_minimum_version], [1.6]) m4_define([gladeui_minimum_version], [3.0.0]) - dnl ********************************** dnl Gtk-3 compatibility dnl ********************************** @@ -86,6 +84,7 @@ if test "x${enable_gtk3}" = "xyes"; then GTKHTML_EDITOR="gtkhtml-editor-4.0" + gweather_minimum_version="2.90.0" libnotify_minimum_version="0.5.1" else LIBEDATASERVERUI="libedataserverui-1.2" @@ -110,6 +109,7 @@ else GTKHTML_EDITOR="gtkhtml-editor-3.14" + gweather_minimum_version="2.25.3" libnotify_minimum_version="0.3.0" fi @@ -1483,7 +1483,7 @@ AC_ARG_ENABLE([weather], [enable_weather="$enableval"],[enable_weather=yes]) if test "x$enable_weather" = "xyes"; then - PKG_CHECK_MODULES([LIBGWEATHER], gweather >= gweather_minimum_version, + PKG_CHECK_MODULES([LIBGWEATHER], gweather >= $gweather_minimum_version, have_weather="yes", have_weather="no") AC_SUBST(GWEATHER_CFLAGS) AC_SUBST(GWEATHER_LIBS) @@ -1491,7 +1491,7 @@ if test "x$enable_weather" = "xyes"; then if test "x$have_weather" = "xyes"; then plugins_base="$plugins_base calendar-weather" else - AC_MSG_ERROR([gweather >= gweather_minimum_version is required for the calendar-weather plugin. Use --disable-weather to exclude the plugin.]) + AC_MSG_ERROR([gweather >= $gweather_minimum_version is required for the calendar-weather plugin. Use --disable-weather to exclude the plugin.]) fi fi |