summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-07-15 13:20:48 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-07-15 13:20:48 -0400
commit555174d510685a2ea2316f12c635c94f3f327370 (patch)
tree706e9ea6f71288b8f77358eaac56d76624a2d340 /wscript
parentfa09121a7f20ba424df5b9542564a467af63dc7a (diff)
Revert "tweaks to mingw build environment"
This reverts commit fa09121a7f20ba424df5b9542564a467af63dc7a.
Diffstat (limited to 'wscript')
-rw-r--r--wscript14
1 files changed, 7 insertions, 7 deletions
diff --git a/wscript b/wscript
index 044e56d12c..a2f470ef03 100644
--- a/wscript
+++ b/wscript
@@ -590,6 +590,13 @@ def configure(conf):
autowaf.check_header(conf, 'cxx', 'jack/session.h', define="JACK_SESSION", mandatory = False)
+ 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.')
+
autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2')
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0')
@@ -614,13 +621,6 @@ def configure(conf):
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')