X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=e42dbbea311abab4eec3d83a06326eecdf183856;hb=49f28513f5f3f343ee9d51b0df25c7bd78478542;hp=a86da47bbc58cb35ed080186f0b12cc13cac9eb7;hpb=aaa55870bbadd5e2a354b3f5184362709df7171c;p=ardour.git

diff --git a/wscript b/wscript
index a86da47bbc..e42dbbea31 100644
--- 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=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,7 +110,7 @@ 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)
 	
@@ -127,6 +127,9 @@ def configure(conf):
 	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)