summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-04-17 09:52:15 -0700
committerKonstantin Käfer <mail@kkaefer.com>2014-04-17 09:52:15 -0700
commit871bb9d02ea30d80fc7a473f30652d12f407db45 (patch)
tree2501b48cd1dfe4b9ed003ef4ccf6a77af504f97c /configure
parente7274c786624ba1f07eba580978d47cf2a81f899 (diff)
downloadqtlocation-mapboxgl-871bb9d02ea30d80fc7a473f30652d12f407db45.tar.gz
make sure pkg-config includes all system folders
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 88f9dcf90a..3c9a421bf6 100755
--- a/configure
+++ b/configure
@@ -38,12 +38,14 @@ def pkg_config(pkg, pkgconfig_root):
env = os.environ.copy()
if pkgconfig_root:
env["PKG_CONFIG_PATH"] = pkgconfig_root
+ env["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "1"
+ env["PKG_CONFIG_ALLOW_SYSTEM_LIBS"] = "1"
cmd = subprocess.Popen(['pkg-config', '--static', '--libs', pkg], stdout=subprocess.PIPE, env=env)
libs, ret = cmd.communicate()
if (ret): return None
- cmd = subprocess.Popen(['pkg-config', '--cflags', pkg], stdout=subprocess.PIPE, env=env)
- cflags, red = cmd.communicate()
+ cmd = subprocess.Popen(['pkg-config', '--static', '--cflags', pkg], stdout=subprocess.PIPE, env=env)
+ cflags, ret = cmd.communicate()
if (ret): return None
return (libs, cflags)