X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=051d97d07c77e8d6816ca91926026b55568e1847;hb=e6eb059576eefd9a26c177627ae7dd3ba2feb727;hp=f8001ca58ec678605896f2e0ef9f6b47c67ccab5;hpb=c54fe0e7cdba6b7496d759e617f89efcbcb494d6;p=ardour.git

diff --git a/wscript b/wscript
index f8001ca58e..051d97d07c 100644
--- a/wscript
+++ b/wscript
@@ -95,7 +95,7 @@ def set_options(opt):
 			help='Compile with support for LV2 (if slv2 is available)')
 	opt.add_option('--nls', action='store_true', default=True, dest='nls',
 			help='Enable i18n (native language support)')
-	opt.add_option('--surfaces', action='store_true', default=True, dest='surfaces',
+	opt.add_option('--surfaces', action='store_true', default=False, 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')
@@ -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,7 @@ 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'] = []