ardour/livetrax
13
0
Fork 0
Code

Remove duplicate test for presence of boost header

Browse Source
This commit is contained in:
Tim Mayberry 2014-05-04 09:22:10 +10:00
parent b895a8f631
commit da596182e1
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wscript
View File

@ -665,6 +665,7 @@ def configure(conf):
# executing a test program is n/a when cross-compiling # executing a test program is n/a when cross-compiling
if Options.options.dist_target != 'mingw': 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 <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
execute = "1", execute = "1",
mandatory = True, mandatory = True,
@ -701,16 +702,6 @@ def configure(conf):
# TODO put this only where it is needed # TODO put this only where it is needed
conf.env.append_value('LIB', 'regex') 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 <boost/version.hpp>\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 # Tell everyone that this is a waf build
conf.env.append_value('CFLAGS', '-DWAF_BUILD') conf.env.append_value('CFLAGS', '-DWAF_BUILD')