From 3115443b17dc93e9024b5b145c665dff3690a903 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Fri, 7 Jan 2011 08:34:17 +0200 Subject: [PATCH] * configure.ac: check for webkit --- configure.ac | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7e5d40bd..f7768421 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2010 Dirk-Jan C. Binnema +## Copyright (C) 2008-2011 Dirk-Jan C. Binnema ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -114,6 +114,14 @@ AC_SUBST(GMIME_CFLAGS) AC_SUBST(GMIME_LIBS) +# webkit? needed for the fancy web widget +PKG_CHECK_MODULES(WEBKIT,webkit-1.0,[have_webkit=yes],[have_webkit=no]) +AS_IF([test "x$have_webkit" = "xyes"],[ + webkit_version="`pkg-config --modversion webkit-1.0`"]) +AC_SUBST(WEBKIT_CFLAGS) +AC_SUBST(WEBKIT_LIBS) +AM_CONDITIONAL(HAVE_WEBKIT, [test "x$have_webkit" = "xyes"]) + # xapian? AC_CHECK_PROG(XAPIAN,xapian-config,xapian-config,no) @@ -144,9 +152,6 @@ AC_SUBST(XAPIAN_LIBS) AC_DEFINE(MU_XAPIAN_DB_VERSION,["9.0"], [Schema version of the database]) - - - # we test for gtk, which we need if we want to build 'mug'; for # experiments it can try to build with gtk3, but since that is still # under development, you need to explicitly enable this with '--with-gtk3' @@ -217,10 +222,15 @@ fi echo "Xapian version : $xapian_version" echo "GLib version : $glib_version" echo "GMime version : $gmime_version" + if test "x$have_gtk" != "xno"; then echo "GTK+ version : $gtk_version" fi +if test "x$have_webkit" != "xno"; then +echo "Webkit version : $webkit_version" +fi + echo echo "Build unit tests (glib >= 2.22) : $have_gtest" echo "Build 'mug' (requires GTK+) : $have_gtk"