summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-10-09 14:00:42 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-10-09 14:00:42 -0400
commit2a6a16f980ff9181b138f7a30aedfbde4426a591 (patch)
treed86752508bbd033be18301796e7d0c571a4fe1c0 /wscript
parent66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff)
parent465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544 (diff)
merge with master, fixing conflicts in 3 wscript files
Diffstat (limited to 'wscript')
-rw-r--r--wscript12
1 files changed, 7 insertions, 5 deletions
diff --git a/wscript b/wscript
index 82a5ac8b77..4046caf47a 100644
--- a/wscript
+++ b/wscript
@@ -57,7 +57,7 @@ def fetch_gcc_version (CC):
return version
def fetch_git_revision ():
- cmd = "LANG= git describe --tags HEAD"
+ cmd = "git describe --tags HEAD"
output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
rev = output[0].decode('utf-8')
return rev
@@ -603,7 +603,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')
@@ -675,8 +680,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:
@@ -738,7 +741,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'))