[empathy: 11/14] Check for webkitgtk-3.0 when building with GTK3
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 11/14] Check for webkitgtk-3.0 when building with GTK3
- Date: Thu, 8 Jul 2010 12:36:59 +0000 (UTC)
commit 757c4d6c3e3a1872588387bfd49f473ce444b3cf
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Jul 8 10:36:16 2010 +0200
Check for webkitgtk-3.0 when building with GTK3
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2656c9e..175b766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,10 +284,14 @@ AC_ARG_ENABLE(webkit,
enable_webkit=auto)
if test "x$enable_webkit" != "xno"; then
- PKG_CHECK_MODULES(WEBKIT,
- [
- webkit-1.0 >= $WEBKIT_REQUIRED
- ], have_webkit="yes", have_webkit="no")
+
+ if test "x$enable_gtk3" == "xno"; then
+ PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED],
+ have_webkit="yes", have_webkit="no")
+ else
+ PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED],
+ have_webkit="yes", have_webkit="no")
+ fi
if test "x$have_webkit" = "xyes"; then
AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]