[balsa/gtk3] Simplify WebKit2 configuration
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Simplify WebKit2 configuration
- Date: Sat, 6 Apr 2013 22:36:14 +0000 (UTC)
commit 87612408b17de82019ff5ed66d794d282f52bb6d
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sat Apr 6 18:35:32 2013 -0400
Simplify WebKit2 configuration
* configure.ac: simplify WebKit2 configuration.
ChangeLog | 4 ++++
configure.ac | 8 ++------
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 72d71e9..d90f954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-04-06 Peter Bloomfield
+ * configure.ac: simplify WebKit2 configuration.
+
+2013-04-06 Peter Bloomfield
+
* configure.ac: require GtkSourceView 3.2
* src/sendmsg-window.c: gtksource.h is the main header; fixes
bgo #697454 (Dominique Leuenberger).
diff --git a/configure.ac b/configure.ac
index 0f0f3bb..7342ce3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -421,12 +421,8 @@ case "$use_html_widget" in
fi
fi
if test $use_html_widget = webkit2 ; then
- if $PKG_CONFIG --atleast-version=1.11.92 webkitgtk-3.0 ; then
- PKG_CHECK_MODULES(HTML, [webkit2gtk-3.0 javascriptcoregtk-3.0])
- AC_DEFINE(USE_WEBKIT2,1,[Defined when WebKit2 is requested.])
- else
- AC_MSG_ERROR([Webkit2 requires version at least 1.11.92])
- fi
+ PKG_CHECK_MODULES(HTML, [webkit2gtk-3.0 >= 1.11.92 ])
+ AC_DEFINE(USE_WEBKIT2,1,[Defined when WebKit2 is requested.])
else
if $PKG_CONFIG --atleast-version=1.5.1 webkitgtk-3.0 ; then
PKG_CHECK_MODULES(HTML, [webkitgtk-3.0 javascriptcoregtk-3.0])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]