From b50b4b6f84dc990b870d2f6cf59fd758c1607fa0 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 10 Jul 2017 13:27:25 +0100 Subject: [PATCH] scons: split out check_header() helper Signed-off-by: Eric Engestrom --- scons/gallium.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scons/gallium.py b/scons/gallium.py index 61643a6d4fc..c8e47a39db1 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -145,6 +145,17 @@ def check_cc(env, cc, expr, cpp_opt = '-E'): sys.stdout.write(' %s\n' % ['no', 'yes'][int(bool(result))]) return result +def check_header(env, header): + '''Check if the header exist''' + + conf = SCons.Script.Configure(env) + have_header = False + + if conf.CheckHeader(header): + have_header = True + + env = conf.Finish() + return have_header def check_prog(env, prog): """Check whether this program exists.""" @@ -325,10 +336,8 @@ def generate(env): 'GLX_INDIRECT_RENDERING', ] - conf = SCons.Script.Configure(env) - if conf.CheckHeader('xlocale.h'): + if check_header(env, 'xlocale.h'): cppdefines += ['HAVE_XLOCALE_H'] - env = conf.Finish() if platform == 'windows': cppdefines += [ -- 2.30.2