[balsa/gtk3] Use webkit with threads disabled if glib is recent
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Use webkit with threads disabled if glib is recent
- Date: Tue, 30 Aug 2011 22:35:03 +0000 (UTC)
commit 92b9a5b67734cd9e5b085860efe4bf60e8a78b76
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Aug 30 18:34:09 2011 -0400
Use webkit with threads disabled if glib is recent
* configure.in: webkit can be used with threads disabled if glib
version is 2.24 or later.
ChangeLog | 5 +++++
configure.in | 4 +++-
2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5bfcea0..191a4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30 Peter Bloomfield
+
+ * configure.in: webkit can be used with threads disabled if glib
+ version is 2.24 or later.
+
2011-08-29 Pawel Salek
* libbalsa/filter-funcs.c: implement libbalsa_condition_to_string_user
diff --git a/configure.in b/configure.in
index f82215c..69c157f 100644
--- a/configure.in
+++ b/configure.in
@@ -400,7 +400,9 @@ case "$use_html_widget" in
webkit)
AC_MSG_RESULT([$use_html_widget])
if test x"$use_threads" = xno ; then
- AC_MSG_ERROR([WebKit cannot be used with threads disabled.])
+ if ! $PKG_CONFIG --atleast-version=2.24.0 glib-2.0; then
+ AC_MSG_ERROR([WebKit cannot be used with threads disabled and glib older than version 2.24.])
+ fi
fi
PKG_CHECK_MODULES(HTML, [webkitgtk-3.0])
AC_DEFINE(HAVE_WEBKIT,1,[Defined when WebKit can be used.])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]