summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-10-06 13:18:01 +0200
committerSimo Fält <simo.falt@digia.com>2014-10-06 17:17:25 +0200
commit523f5c6722b6fee5b6ddbf1184c76d009eb61fc5 (patch)
tree8937d64aaa2262bf8f0708cfc794023cc88702ce /configure
parentbf28e2fc133c8d9f966cd2db51f7c76928395e0d (diff)
Allow using pkg-config on OS X/iOS using explicit -pkg-config to configure
Fixup after d44781730ccd4d4, which would override whatever the user passed on the command line. Change-Id: If4d260801866ff53de3e6dfd6d37016fd8453d8d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 74ff31eb04..6597262053 100755
--- a/configure
+++ b/configure
@@ -3144,7 +3144,7 @@ if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then
fi
if [ "$XPLATFORM_MAC" = "yes" ]; then
- CFG_PKGCONFIG="no"
+ [ "$CFG_PKGCONFIG" = "auto" ] && CFG_PKGCONFIG="no"
fi
if [ "$XPLATFORM_IOS" = "yes" ]; then