[empathy: 12/14] disable champlain when using GTK3
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 12/14] disable champlain when using GTK3
- Date: Thu, 8 Jul 2010 12:37:04 +0000 (UTC)
commit 166785e324a397f3b1444820102a41413041d76d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Jul 8 10:50:59 2010 +0200
disable champlain when using GTK3
configure.ac | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 175b766..2426c2f 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]