[pan2] build fix for webkit
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] build fix for webkit
- Date: Tue, 2 Oct 2012 19:43:59 +0000 (UTC)
commit 87dfb36c84d5b0ff98e39b813cbbe5b7a028ff53
Author: Heinrich MÃller <henmull src gnome org>
Date: Tue Oct 2 21:43:16 2012 +0200
build fix for webkit
configure.in | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index 5cf7ead..2895646 100644
--- a/configure.in
+++ b/configure.in
@@ -139,8 +139,6 @@ if test "x$want_gtk3" = "xyes" ; then
])
fi
- PKG_CHECK_MODULES([WEBKITGTK], [webkitgtk-3.0 >= $WEBKIT_REQUIRED],AC_DEFINE(HAVE_WEBKIT,[1],[webkit support (3.0) for embedded html]),[])
-
else
if test "x$want_gtkspell" = "xyes" ; then
PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant >= $ENCHANT_REQUIRED],
@@ -154,9 +152,20 @@ else
])
fi
- PKG_CHECK_MODULES([WEBKITGTK], [webkitgtk-1.0 >= $WEBKIT_REQUIRED],AC_DEFINE(HAVE_WEBKIT,[1],[webkit support (1.0) for embedded html]),[])
-
AM_PATH_GTK_2_0($GTK_REQUIRED,,exit 1,gthread)
+
+fi
+
+AC_ARG_WITH(webkit, AS_HELP_STRING([--with-webkit],[enable webkit gtk support (normally: no)]), [want_webkit=$withval], [want_webkit=no])
+
+if test "x$want_gtk3" = "xyes" ; then
+ if test "x$want_webkit" = "xyes" ; then
+ PKG_CHECK_MODULES([WEBKITGTK], [webkitgtk-3.0 >= $WEBKIT_REQUIRED],AC_DEFINE(HAVE_WEBKIT,[1],[webkit support (3.0) for embedded html],[AC_MSG_RESULT(no)]))
+ fi
+else
+ if test "x$want_webkit" = "xyes" ; then
+ PKG_CHECK_MODULES([WEBKITGTK], [webkitgtk-1.0 >= $WEBKIT_REQUIRED],AC_DEFINE(HAVE_WEBKIT,[1],[webkit support (1.0) for embedded html], [AC_MSG_RESULT(no)]))
+ fi
fi
AC_SUBST(ENCHANT_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]