From d4bfaafbd7dc59f971c1abe67e8245163ca39132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@nokia.com>
Date: Thu, 10 Mar 2011 13:38:14 +0100
Subject: Configuring a static Qt build did not exclude WebKit if the -webkit
 option was given.

Since the script only checked the value of canBuildWebKit when
CFG_WEBKIT was set to "auto", a static WebKit build was still possible,
this again resulted in build (linking) errors later in the build process.

Note: The changes in this patch means that -static will take precedence
      over -webkit.

Reviewed-by: Simon Hausmann
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index cddea86..a542314 100755
--- a/configure
+++ b/configure
@@ -7479,7 +7479,7 @@ else
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG"
 fi
 
-if [ "$CFG_WEBKIT" = "auto" ]; then
+if [ "$CFG_WEBKIT" != "no" ]; then
     CFG_WEBKIT="$canBuildWebKit"
 fi
 
-- 
cgit v0.12