From fcf6d6fc9af5c1ae8ac56ddc68de86560be1486c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 26 Dec 2017 14:41:02 -0500 Subject: Upgrade to waf 2.0.3 --- wscript | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 9896972..fca5aff 100644 --- a/wscript +++ b/wscript @@ -20,10 +20,9 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.line_just = 44 - conf.load('compiler_cxx') - autowaf.configure(conf) autowaf.display_header('Machina Configuration') + conf.load('compiler_cxx', cache=True) + conf.load('autowaf', cache=True) autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.2.0', mandatory=True) @@ -47,10 +46,10 @@ def configure(conf): atleast_version='0.0.0', mandatory=False) # Check for posix_memalign (OSX, amazingly, doesn't have it) - conf.check(function_name='posix_memalign', - header_name='stdlib.h', - define_name='HAVE_POSIX_MEMALIGN', - mandatory=False) + autowaf.check_function(conf, 'cxx', 'posix_memalign', + header_name = 'stdlib.h', + define_name = 'HAVE_POSIX_MEMALIGN', + mandatory = False) if conf.env.HAVE_GTKMM and conf.env.HAVE_GANV: autowaf.define(conf, 'MACHINA_BUILD_GUI', 1) @@ -62,6 +61,7 @@ def configure(conf): conf.write_config_header('machina_config.h', remove=False) + autowaf.display_summary(conf) autowaf.display_msg(conf, "Jack", bool(conf.env.HAVE_JACK)) autowaf.display_msg(conf, "GUI", bool(conf.env.MACHINA_BUILD_GUI)) print('') -- cgit v1.2.1