From 06afa508f2de34cbce9a2798d9418d62e480c283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@nokia.com>
Date: Tue, 5 Oct 2010 17:48:37 +0200
Subject: Issue a warning and disable webkit build when xrender is disabled on
 X11

Nsplugin fails to build when xrender is disabled and webkit is enabled.
This commit modifies configure to automatically disable webkit on X11
when this situation occurs.

Reviewed by: Simon Hausmann
---
 configure | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure b/configure
index ceedaaa..826025d 100755
--- a/configure
+++ b/configure
@@ -5745,6 +5745,12 @@ if [ "$PLATFORM_X11" = "yes" ]; then
 	fi
     fi
 
+    # Additional check to decide if WebKit support will be included
+    if [ "$CFG_XRENDER" = "no" ] && [ "$CFG_WEBKIT" != "no" ]; then
+        echo "Warning: -no-xrender will disable the QtWebkit module."
+        CFG_WEBKIT="no"
+    fi
+
     # auto-detect MIT-SHM support
     if [ "$CFG_MITSHM" != "no" ]; then
 	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-- 
cgit v0.12