aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-08 16:50:59 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-08 17:40:31 +0800
commit166785e324a397f3b1444820102a41413041d76d (patch)
tree4f25ae6d6b96488d080afa5eb6389330101d933c
parent757c4d6c3e3a1872588387bfd49f473ce444b3cf (diff)
downloadgsoc2013-empathy-166785e324a397f3b1444820102a41413041d76d.tar
gsoc2013-empathy-166785e324a397f3b1444820102a41413041d76d.tar.gz
gsoc2013-empathy-166785e324a397f3b1444820102a41413041d76d.tar.bz2
gsoc2013-empathy-166785e324a397f3b1444820102a41413041d76d.tar.lz
gsoc2013-empathy-166785e324a397f3b1444820102a41413041d76d.tar.xz
gsoc2013-empathy-166785e324a397f3b1444820102a41413041d76d.tar.zst
gsoc2013-empathy-166785e324a397f3b1444820102a41413041d76d.zip
disable champlain when using GTK3
-rw-r--r--configure.ac18
1 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 175b7669f..2426c2f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,17 +352,23 @@ AC_ARG_ENABLE(map,
enable_map=auto)
if test "x$enable_map" != "xno"; then
- PKG_CHECK_MODULES(LIBCHAMPLAIN,
- [
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
- clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
- ], have_libchamplain="yes", have_libchamplain="no")
+
+ if test "x$enable_gtk3" == "xno"; then
+ PKG_CHECK_MODULES(LIBCHAMPLAIN,
+ [
+ champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
+ ], have_libchamplain="yes", have_libchamplain="no")
+ else
+ have_libchamplain="no"
+ fi
if test "x$have_libchamplain" = "xyes"; then
AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain])
fi
else
+ # FIXME: check deps once clutter-gtk and champlain have been ported to GTK3
have_libchamplain=no
fi