From ca4b209ae64723c2a895f2d385ab9553c75fc2a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 2 Feb 2011 09:34:50 -0500 Subject: 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 file changed, 2 insertions(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 787f197e72..f083996c5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1493,15 +1493,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]) -- cgit