summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-09-12 09:01:45 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-12 10:49:50 +0200
commit7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e (patch)
treeee21ee7c3333fcfc189dd70275e83bfac225583b /configure
parent4ae829c1dbd0e8a72b82ab4c6cddb0a4ffe009f6 (diff)
Partial revert "cross compile with mingw": unbreak pkg-config
This partially reverts commit 07a978d3d4b41739eff1061dc45dbfa737bf78b9. 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. Change-Id: Ia4a8d18cd57f74a00bdb9b6a171d20151978a9cc Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> 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 b9fc11d076..a2413aaa8b 100755
--- a/configure
+++ b/configure
@@ -1364,7 +1364,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