put mixer strip track name button context menu back on button3 ONLY, and make button1...

[ardour.git] / wscript

diff --git a/wscript b/wscript
index f69cb639315a28d50bcd49fb16f5b66e75f5f4d7..371f2146912de02fd389df8b85145fab3ef3b9b8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -313,6 +313,8 @@ def set_compiler_flags (conf,opt):
 
 def set_options(opt):
        autowaf.set_options(opt)
+       opt.add_option('--program-name', type='string', action='store', default='Ardour', dest='program_name',
+                       help='The user-visible name of the program being built')
        opt.add_option('--arch', type='string', action='store', dest='arch',
                        help='Architecture-specific compiler flags')
        opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug',
@@ -457,7 +459,9 @@ def configure(conf):
        if Options.options.boost_sp_debug:
                conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
 
-       autowaf.check_header(conf, 'boost/signals2.hpp')
+       autowaf.check_header(conf, 'boost/signals2.hpp', mandatory = True)
+
+       autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION")
 
        conf.check_cc(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
                      execute = "1",
@@ -522,12 +526,16 @@ def configure(conf):
        autowaf.display_msg(conf, 'VST Support', opts.vst)
        if opts.vst:
                conf.define('VST_SUPPORT', 1)
+       if bool(conf.env['JACK_SESSION']):
+               conf.define ('HAVE_JACK_SESSION', 1)
        autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote)
        if opts.wiimote:
                conf.define('WIIMOTE',1)
        if opts.windows_key:
                conf.define('WINDOWS_KEY', opts.windows_key)
        autowaf.display_msg(conf, 'Windows Key', opts.windows_key)
+        conf.env['PROGRAM_NAME'] = opts.program_name
+        autowaf.display_msg(conf, 'Program Name', opts.program_name)
 
        set_compiler_flags (conf, Options.options)