From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 22 Sep 2012 08:30:17 +0000 (+0200)
Subject: configure: remove CONFIG features while getting PKG_CONFIG
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e78f84f4e59f417e2837b6eeeaff0b14f85309e;p=profile%2Fivi%2Fqtbase.git

configure: remove CONFIG features while getting PKG_CONFIG

When qmake is used to get PKG_CONFIG, core and gui are not
available. This motivates CONFIG-=qt. In fact, we don't need any
features for this job.

Change-Id: Id247054d43c50f6aeb62db7585c3e90f57aa36a1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---

diff --git a/configure b/configure
index 97110b9..4bec556 100755
--- a/configure
+++ b/configure
@@ -3697,7 +3697,7 @@ fi
 #-------------------------------------------------------------------------------
 if [ -z "$PKG_CONFIG" ]; then
     # See if PKG_CONFIG is set in the mkspec:
-    PKG_CONFIG="`"$outpath/bin/qmake" -E -nocache -spec "$XQMAKESPEC" /dev/null 2>&1 | sed -n -e 's,^PKG_CONFIG = \(.*\),\1,p'`"
+    PKG_CONFIG="`"$outpath/bin/qmake" -E -nocache -spec "$XQMAKESPEC" "CONFIG=" /dev/null 2>&1 | sed -n -e 's,^PKG_CONFIG = \(.*\),\1,p'`"
 fi
 if [ -z "$PKG_CONFIG" ]; then
     PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`