Merge branch 'master' into cairocanvas

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 3ce4b2210c110cf7c3841a29b8d6bfcd90688777..8bca24f28d8ffafd41558e135976677d34b3b8d3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -412,8 +412,6 @@ def options(opt):
                    help='Build internal libs as shared libraries')
     opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs',
                    help='Build internal libs as static libraries')
-    opt.add_option('--videotimeline', action='store_true', default=False, dest='videotimeline',
-                    help='Compile with support for video-timeline')
     opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
                     help='Compile with support for LV2 (if Lilv+Suil is available)')
     opt.add_option('--no-lv2', action='store_false', dest='lv2',
@@ -635,9 +633,6 @@ def configure(conf):
         conf.env['BUILD_TESTS'] = opts.build_tests
     #if opts.tranzport:
     #    conf.env['TRANZPORT'] = 1
-    if opts.videotimeline:
-        conf.define('WITH_VIDEOTIMELINE',1)
-        conf.env['VIDEOTIMELINE'] = 1
     if opts.windows_vst:
         conf.define('WINDOWS_VST_SUPPORT', 1)
         conf.env['WINDOWS_VST_SUPPORT'] = True
@@ -716,7 +711,6 @@ const char* const ardour_config_info = "\\n\\
 #    write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.env['BUILD_TESTS'])
     write_config_text('Universal binary',      opts.universal)
-    write_config_text('Videotimeline',         opts.videotimeline)
     write_config_text('Generic x86 CPU',       opts.generic)
     write_config_text('Windows VST support',   opts.windows_vst)
     write_config_text('Wiimote support',       conf.is_defined('BUILD_WIIMOTE'))