summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2014-05-04 09:22:10 +1000
committerTim Mayberry <mojofunk@gmail.com>2014-05-14 09:47:40 +1000
commitda596182e18a4a21e1095c056ccb53066e6e2015 (patch)
tree23bccd4c97a20ed851a3b9f85b4f6006506b0ef6 /wscript
parentb895a8f631dc5d076cfb97349d63959b043f360c (diff)
Remove duplicate test for presence of boost header
Diffstat (limited to 'wscript')
-rw-r--r--wscript11
1 files changed, 1 insertions, 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 <boost/version.hpp>\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 <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
conf.env.append_value('CFLAGS', '-DWAF_BUILD')