Allow Insert Time option to move tempos and time sig changes, as per #1951.

[ardour.git] / wscript

diff --git a/wscript b/wscript
index ed24893dfd57dda19bc5a47a17d159324472fc5a..471ed1f0bf7bed12e3c9d9bc3d43d66f9da90afb 100644 (file)
--- a/wscript
+++ b/wscript
@@ -62,7 +62,7 @@ def create_stored_revision():
        try:
                text =  '#include <ardour/svn_revision.h>\n'
                text += 'namespace ARDOUR { extern const char* svn_revision = \"' + rev + '\"; }\n'
-               print 'Writing svn revision info to libs/ardour/svn_revision.cc\n'
+               print 'Writing svn revision info to libs/ardour/svn_revision.cc'
                o = file('libs/ardour/svn_revision.cc', 'w')
                o.write(text)
                o.close()
@@ -80,7 +80,7 @@ def set_options(opt):
        opt.add_option('--aubio', action='store_true', default=True, dest='aubio',
                        help="Use Paul Brossier's aubio library for feature detection (if available)")
        opt.add_option('--audiounits', action='store_true', default=False, dest='audiounits',
-                       help='Compile with Apple\'s AudioUnit library. (experimental)')
+                       help='Compile with Apple\'s AudioUnit library (experimental)')
        opt.add_option('--coreaudio', action='store_true', default=False, dest='coreaudio',
                        help='Compile with Apple\'s CoreAudio library')
        opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization',
@@ -94,15 +94,15 @@ def set_options(opt):
        opt.add_option('--lv2', action='store_true', default=False, dest='lv2',
                        help='Compile with support for LV2 (if slv2 is available)')
        opt.add_option('--nls', action='store_true', default=True, dest='nls',
-                       help='Set to turn on i18n support')
+                       help='Enable i18n (native language support)')
        opt.add_option('--surfaces', action='store_true', default=True, dest='surfaces',
                        help='Build support for control surfaces')
-       opt.add_option('--syslibs', action='store_true', default=False, dest='syslibs',
+       opt.add_option('--syslibs', action='store_true', default=True, dest='syslibs',
                        help='Use existing system versions of various libraries instead of internal ones')
        opt.add_option('--tranzport', action='store_true', default=True, dest='tranzport',
-                       help='Compile with support for Frontier Designs (if libusb is available)')
+                       help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
        opt.add_option('--universal', action='store_true', default=False, dest='universal',
-                       help='Compile as universal binary.  Requires that external libraries are universal.')
+                       help='Compile as universal binary (requires that external libraries are universal)')
        opt.add_option('--versioned', action='store_true', default=False, dest='versioned',
                        help='Add revision information to executable name inside the build directory')
        opt.add_option('--vst', action='store_true', default=False, dest='vst',
@@ -110,10 +110,10 @@ def set_options(opt):
        opt.add_option('--wiimote', action='store_true', default=False, dest='wiimote',
                        help='Build the wiimote control surface')
        opt.add_option('--windows-key', type='string', dest='windows_key',
-                       help='Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key [Default: Mod4]')
+                       help='Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key [Default: Mod4]', default='Mod4><Super')
        for i in children:
                opt.sub_options(i)
-       
+
 def sub_config_and_use(conf, name, has_objects = True):
        conf.sub_config(name)
        autowaf.set_local_lib(conf, name, has_objects)
@@ -126,7 +126,10 @@ def configure(conf):
        autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
        for i in children:
                sub_config_and_use(conf, i)
-       
+
+       # Fix utterly braindead FLAC include path to not smash assert.h
+       conf.env['CPPPATH_FLAC'] = []
+
        autowaf.print_summary(conf)
        opts = Options.options
        autowaf.display_header('Ardour Configuration')
@@ -139,6 +142,9 @@ def configure(conf):
        autowaf.display_msg(conf, 'Freesound', opts.freesound)
        autowaf.display_msg(conf, 'GtkOSX', opts.gtkosx)
        autowaf.display_msg(conf, 'LV2 Support', bool(conf.env['HAVE_SLV2']))
+       autowaf.display_msg(conf, 'Rubberband', bool(conf.env['HAVE_RUBBERBAND']))
+       autowaf.display_msg(conf, 'Samplerate', bool(conf.env['HAVE_SAMPLERATE']))
+       autowaf.display_msg(conf, 'Soundtouch', bool(conf.env['HAVE_SOUNDTOUCH']))
        autowaf.display_msg(conf, 'Translation', opts.nls)
        autowaf.display_msg(conf, 'Surfaces', opts.surfaces)
        autowaf.display_msg(conf, 'System Libraries', opts.syslibs)