summaryrefslogtreecommitdiffstats
path: root/platform/x11/detect.py
diff options
context:
space:
mode:
authorKostadin Damyanov <maxmight@gmail.com>2015-09-05 12:03:17 +0300
committerKostadin Damyanov <maxmight@gmail.com>2015-09-05 12:03:17 +0300
commitc5f574b914b3cb11d97ae616df4a0bced45bb17c (patch)
treed7b70f0842c00c480ce10039b873a1dddd894a6c /platform/x11/detect.py
parent2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1 (diff)
parentb0aa49accbd7e45dae38f1bd43b0fbdd11714211 (diff)
downloadredot-engine-c5f574b914b3cb11d97ae616df4a0bced45bb17c.tar.gz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/x11/detect.py')
-rw-r--r--platform/x11/detect.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index ff85e286db..b8890a3a2f 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -126,7 +126,9 @@ def configure(env):
env.ParseConfig('pkg-config x11 --cflags --libs')
env.ParseConfig('pkg-config xinerama --cflags --libs')
env.ParseConfig('pkg-config xcursor --cflags --libs')
- env.ParseConfig('pkg-config openssl --cflags --libs')
+
+ if (env["openssl"]=="yes"):
+ env.ParseConfig('pkg-config openssl --cflags --libs')
env.ParseConfig('pkg-config freetype2 --cflags --libs')