[balsa] Check for javascriptcoregtk



commit 103cd5d127803c7fc0c3c039e232a42169028907
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Sep 28 08:06:44 2011 -0400

    Check for javascriptcoregtk
    
    	* configure.in: check for javascriptcoregtk with recent webkit;
    	thanks to Vincent Untz and Marcus HÃwe; fixes bgo #660263.

 ChangeLog    |    5 +++++
 configure.in |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b75aaee..2984bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-28  Peter Bloomfield
+
+	* configure.in: check for javascriptcoregtk with recent webkit;
+	thanks to Vincent Untz and Marcus HÃwe; fixes bgo #660263.
+
 2011-09-18  Peter Bloomfield
 
 	* src/print-gtk.c (draw_page): use ngettext for plural; fixes
diff --git a/configure.in b/configure.in
index 7505365..5083865 100644
--- a/configure.in
+++ b/configure.in
@@ -402,7 +402,11 @@ case "$use_html_widget" in
         if test x"$use_threads" = xno ; then
             AC_MSG_ERROR([WebKit cannot be used with threads disabled.])
         fi
-        PKG_CHECK_MODULES(HTML, [webkit-1.0])
+        if $PKG_CONFIG --atleast-version=1.5.1 webkit-1.0; then
+            PKG_CHECK_MODULES(HTML, [webkit-1.0 javascriptcoregtk-1.0])
+        else
+            PKG_CHECK_MODULES(HTML, [webkit-1.0])
+        fi
         AC_DEFINE(HAVE_WEBKIT,1,[Defined when WebKit can be used.])
     ;;
     no)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]