[evolution/webkit] Fix champlain-gtk checks in configure.ac.
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit] Fix champlain-gtk checks in configure.ac.
- Date: Mon, 11 Jul 2011 14:09:22 +0000 (UTC)
commit 188b07befbaa40a625180f519656a0cdab99309a
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Feb 2 09:34:50 2011 -0500
Fix champlain-gtk checks in configure.ac.
Check for champlain-gtk-0.8 not 0.5, and drop the fallback to 0.4.
configure.ac | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fc5ce43..3114741 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1496,15 +1496,12 @@ if test "x$enable_plugins" = "xexperimental"; then
[enable_contacts_map="$enableval"], [enable_contacts_map=yes])
if test "x$enable_contacts_map" = "xyes"; then
- PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.5 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
- if test "x$have_champlain" = "xno"; then
- PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.4 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
- fi
+ PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.8 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
AC_SUBST(CHAMPLAIN_CFLAGS)
AC_SUBST(CHAMPLAIN_LIBS)
if test "x$have_champlain" = "xno"; then
- AC_MSG_ERROR([champlain-gtk >= champlain_minimum_version is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.])
+ AC_MSG_ERROR([champlain-gtk-0.8 >= champlain_minimum_version is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.])
fi
PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]