[evolution] Update clutter-gtk requirement for gtk+-3.0.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update clutter-gtk requirement for gtk+-3.0.
- Date: Mon, 26 Jul 2010 18:31:05 +0000 (UTC)
commit 87404d305a0b4d28a593cbc6b62b3f01d36c2b46
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Jul 26 14:03:58 2010 -0400
Update clutter-gtk requirement for gtk+-3.0.
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c578a6c..53d2519 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,9 @@ if test "x${enable_gtk3}" = "xyes"; then
CANBERRA_GTK="libcanberra-gtk3"
libcanberra_gtk_minimum_version="0.25"
+ CLUTTER_GTK="clutter-gtk-1.0"
+ clutter_gtk_minimum_version="0.90"
+
GTKHTML="libgtkhtml-4.0"
libgtkhtml_minimum_version="3.31.4"
@@ -90,7 +93,6 @@ if test "x${enable_gtk3}" = "xyes"; then
dnl link to gtk+-2.0 so we've bumped the versions to some
dnl bogus value to force some plugins to be disabled.
champlain_minimum_version="0.8"
- clutter_gtk_minimum_version="1.0"
gtkimageview_minimum_version="2.0"
EVOLUTION_SHELL="evolution-shell-3.0"
@@ -112,6 +114,9 @@ else
CANBERRA_GTK="libcanberra-gtk"
libcanberra_gtk_minimum_version="0"
+ CLUTTER_GTK="clutter-gtk-0.10"
+ clutter_gtk_minimum_version="0.10"
+
GTKHTML="libgtkhtml-3.14"
libgtkhtml_minimum_version="3.31.2"
@@ -121,7 +126,6 @@ else
gweather_minimum_version="2.25.3"
champlain_minimum_version="0.4"
- clutter_gtk_minimum_version="0.10.0"
gtkimageview_minimum_version="1.6"
libnotify_minimum_version="0.3.0"
@@ -1565,10 +1569,10 @@ if test "x$enable_plugins" = "xexperimental"; then
AC_MSG_ERROR([geoclue is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.])
fi
- PKG_CHECK_MODULES( [CLUTTER_GTK], [clutter-gtk-0.10 >= $clutter_gtk_minimum_version], [have_clutter_gtk="yes"], [have_clutter_gtk="no"] )
+ PKG_CHECK_MODULES( [CLUTTER_GTK], [$CLUTTER_GTK >= $clutter_gtk_minimum_version], [have_clutter_gtk="yes"], [have_clutter_gtk="no"] )
if test "x$have_clutter_gtk" = "xno"; then
- AC_MSG_ERROR([clutter_gtk is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.])
+ AC_MSG_ERROR([$CLUTTER_GTK is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.])
fi
plugins_standard="$plugins_standard contacts-map"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]