From: Tim Mayberry <mojofunk@gmail.com>
Date: Sat, 3 May 2014 23:22:10 +0000 (+1000)
Subject: Remove duplicate test for presence of boost header
X-Git-Tag: 4.0-rc1~1601^2~1223^2~5
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=da596182e18a4a21e1095c056ccb53066e6e2015;p=ardour.git

Remove duplicate test for presence of boost header
---

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')