From 700fdf5c0ca4d8078f3fd8e83a7a53b65f0280e0 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 23 Aug 2015 20:54:13 -0300 Subject: [PATCH] fix build issue with ssl, closes #2384 --- SConstruct | 6 +++--- platform/x11/detect.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 9cd1da7f458..9cce6edd812 100644 --- a/SConstruct +++ b/SConstruct @@ -220,14 +220,14 @@ if selected_platform in platform_list: env.Append(LINKFLAGS=string.split(str(LINKFLAGS))) - detect.configure(env) - - flag_list = platform_flags[selected_platform] for f in flag_list: if not (f[0] in ARGUMENTS): # allow command line to override platform flags env[f[0]] = f[1] + #must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11) + detect.configure(env) + #env['platform_libsuffix'] = env['LIBSUFFIX'] suffix="."+selected_platform diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 56e3ba78f66..b8890a3a2f8 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -126,6 +126,7 @@ def configure(env): env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') + if (env["openssl"]=="yes"): env.ParseConfig('pkg-config openssl --cflags --libs')