From 7036b2825a7c3fb2113c269b37cddbb0eb6f02cb Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 21 Oct 2017 17:27:44 +0200 Subject: [PATCH] Detected boost using a compile-time check (works w/x-compile) --- wscript | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wscript b/wscript index a0106f202a..28339cc200 100644 --- a/wscript +++ b/wscript @@ -1019,12 +1019,13 @@ def configure(conf): conf.check_cc(function_name='dlopen', header_name='dlfcn.h', uselib_store='DL') else: 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.') + + conf.check_cxx(fragment = "#include \n#if !defined (BOOST_VERSION) || BOOST_VERSION < 103900\n#error boost >= 1.39 is not available\n#endif\nint main(void) { return 0; }\n", + execute = False, + mandatory = True, + msg = 'Checking for boost library >= 1.39', + okmsg = 'ok', + errmsg = 'too old\nPlease install boost version 1.39 or higher.') if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw': autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')