From da596182e18a4a21e1095c056ccb53066e6e2015 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sun, 4 May 2014 09:22:10 +1000 Subject: [PATCH] Remove duplicate test for presence of boost header --- wscript | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/wscript b/wscript index 52d1ec6e28..fbb1a31dd4 100644 --- a/wscript +++ b/wscript @@ -665,6 +665,7 @@ def configure(conf): # executing a test program is n/a when cross-compiling if Options.options.dist_target != 'mingw': + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", execute = "1", mandatory = True, @@ -701,16 +702,6 @@ def configure(conf): # TODO put this only where it is needed conf.env.append_value('LIB', 'regex') - if Options.options.dist_target != 'mingw': - conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') - - conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", - execute = "1", - mandatory = True, - msg = 'Checking for boost library >= 1.39', - okmsg = 'ok', - errmsg = 'too old\nPlease install boost version 1.39 or higher.') - # Tell everyone that this is a waf build conf.env.append_value('CFLAGS', '-DWAF_BUILD')