From d44781730ccd4d48af79f480813bf3f9a4000253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 30 Sep 2014 16:39:12 +0200 Subject: [PATCH] configure: Disable pkg-config on OS X unless explicitly requested MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't have an explicit XPLATFORM_OSX, but XPLATFORM_MAC applies to both OS X and iOS (as now clarified), so we move the default out of the XPLATFORM_IOS scope and to a XPLATFORM_MAC scope. Change-Id: I6b9ba9c881c28def08b9ab863d0165fbd9dedc6d Reviewed-by: Oswald Buddenhagen Reviewed-by: Morten Johan Sørvig --- configure | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1efb645604..0e9b16fcd8 100755 --- a/configure +++ b/configure @@ -699,8 +699,8 @@ RPATH_FLAGS= W_FLAGS= QCONFIG_FLAGS= XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" -XPLATFORM_MAC=no -XPLATFORM_IOS=no +XPLATFORM_MAC=no # Whether target platform is OS X or iOS +XPLATFORM_IOS=no # Whether target platform is iOS XPLATFORM_ANDROID=no XPLATFORM_MINGW=no # Whether target platform is MinGW (win32-g++*) XPLATFORM_QNX=no @@ -3120,9 +3120,12 @@ if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG force_debug_info" fi +if [ "$XPLATFORM_MAC" = "yes" ]; then + CFG_PKGCONFIG="no" +fi + if [ "$XPLATFORM_IOS" = "yes" ]; then CFG_RPATH="no" - CFG_PKGCONFIG="no" CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples" CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtconnectivity qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples"