From 57069f1bd5e8cd5450f1d1ceae0d6d315b4a66c8 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 12 Sep 2012 00:22:28 +0200 Subject: Partial Revert "Disable pkg-config, when x-compiling for mingw" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Oswald Buddenhagen --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index d19f443..bfaee0e 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 -- cgit v0.12