diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-11 18:23:53 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-11 18:23:53 +0100 |
| commit | fa71d82dda08558caf4a9c5102016f2746883d10 (patch) | |
| tree | aa5d0b7bc074a8d06e3cdb23ad0d4e1646c64c99 /wscript | |
| parent | 300b484cf6ac14c15e365c4062345d64a61c4b18 (diff) | |
| parent | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (diff) | |
Merge branch 'windows' into windows+cc
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -606,7 +606,12 @@ def configure(conf): if Options.options.boost_sp_debug: conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') - 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') @@ -678,8 +683,6 @@ def configure(conf): else: conf.define('LXVST_SUPPORT', 1) conf.env['LXVST_SUPPORT'] = True - if bool(conf.env['JACK_SESSION']): - conf.define('HAVE_JACK_SESSION', 1) conf.define('WINDOWS_KEY', opts.windows_key) conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: @@ -741,7 +744,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('FLAC', conf.is_defined('HAVE_FLAC')) write_config_text('FPU optimization', opts.fpu_optimization) write_config_text('Freedesktop files', opts.freedesktop) - write_config_text('JACK session support', conf.is_defined('JACK_SESSION')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) |