summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-09-12 00:22:28 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-12 19:45:30 +0200
commit57069f1bd5e8cd5450f1d1ceae0d6d315b4a66c8 (patch)
treeae6d714c525ea7645f59a3447e6091ebfcc6d118 /configure
parentbdbfc1d1824c32b00506b2a3b8d1b176c3c9a8a0 (diff)
Partial Revert "Disable pkg-config, when x-compiling for mingw"
This partially reverts commit c7d5071afc6c76925c90ff35041dc4eb86511271. Despite what the commit message said, pkg-config previously worked and was useful, particularly for static Qt. Qt itself even installs its own .pc files. Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid using the pkg-config installation on the build machine. cherry-picked from qt5/qtbase commit 7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e Change-Id: I6c6ed81b2ab42c9cf7f7e250feeeb9c34c8877e7 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure b/configure
index d19f4432d0..bfaee0e361 100755
--- a/configure
+++ b/configure
@@ -1684,7 +1684,6 @@ while [ "$#" -gt 0 ]; do
case `basename "$XPLATFORM"` in win32-g++*)
XPLATFORM_MINGW=yes
CFG_RPATH=no
- PKG_CONFIG=no
CFG_REDUCE_EXPORTS=no
;;
esac