[evolution] Bug 623432 - Use gweather-3.0 when building with gtk3
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 623432 - Use gweather-3.0 when building with gtk3
- Date: Sat, 3 Jul 2010 19:10:49 +0000 (UTC)
commit f835af700c6d5d17516c90fe76867be365059295
Author: Maciej Piechotka <uzytkownik2 gmail com>
Date: Sat Jul 3 15:09:50 2010 -0400
Bug 623432 - Use gweather-3.0 when building with gtk3
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 60574f5..e664073 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,9 @@ if test "x${enable_gtk3}" = "xyes"; then
GTKHTML_EDITOR="gtkhtml-editor-4.0"
+ GWEATHER="gweather-3.0"
+ gweather_minimum_version="2.90.0"
+
libnotify_minimum_version="0.5.1"
dnl XXX These versions don't yet exist. The latest releases
@@ -89,7 +92,6 @@ if test "x${enable_gtk3}" = "xyes"; then
champlain_minimum_version="0.8"
clutter_gtk_minimum_version="1.0"
gtkimageview_minimum_version="2.0"
- gweather_minimum_version="2.90.0"
EVOLUTION_SHELL="evolution-shell-3.0"
else
@@ -115,10 +117,12 @@ else
GTKHTML_EDITOR="gtkhtml-editor-3.14"
+ GWEATHER="gweather"
+ gweather_minimum_version="2.25.3"
+
champlain_minimum_version="0.4"
clutter_gtk_minimum_version="0.10.0"
gtkimageview_minimum_version="1.6"
- gweather_minimum_version="2.25.3"
libnotify_minimum_version="0.3.0"
EVOLUTION_SHELL="evolution-shell"
@@ -1495,7 +1499,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)
@@ -1503,7 +1507,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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]