--- wscript.orig	2014-05-16 18:53:20.735126514 +0200
+++ wscript	2014-05-16 18:57:12.165146644 +0200
@@ -114,6 +114,9 @@
 		ctx.env.append_unique('CFLAGS', '-g3')
 		ctx.env.append_unique('VALAFLAGS', '-g')
 	
+	# enable threads
+	ctx.env.append_unique('VALAFLAGS', '--thread')
+	
 	# Memory debugging
 	if ctx.options.debug_memory:
 		ctx.vala_def("DEBUG_MEMORY")
@@ -322,7 +325,6 @@
 		uselib = uselib,
 		includes = ['src/diorite', 'src'],
 		vala_defines = vala_defines,
-		threading = True,
 		install_path = '${LIBDIR}/%s' % (APPNAME),
 		install_binding = False,
 		vapi_dirs = ['vapi', 'external/vala-0.22']
@@ -334,7 +336,6 @@
 		source = ['src/%s.vala' % APPNAME],
 		includes = ['src/diorite', 'src'],
 		vala_defines = vala_defines,
-		threading = True,
 		install_path = '${LIBDIR}/%s' % (APPNAME),
 		vapi_dirs = ['vapi', 'external/vala-0.22']
 		)
@@ -347,7 +348,6 @@
 		source = ["src/%s.vala" % NUVOLA_CLIENT],
 		includes = ['src/diorite', 'src'],
 		vala_defines = vala_defines,
-		threading = True,
 		vapi_dirs = ['vapi', 'external/vala-0.22']
 		)
 	
@@ -362,7 +362,6 @@
 			packages = "gio-2.0 glib-assertions",
 			uselib = "GIO",
 			source = ctx.path.ant_glob('external/fsotest/*.vala'),
-			threading = True,
 			install_path = None,
 			install_binding = False,
 			vapi_dirs = ['vapi', 'external/vala-0.22']
@@ -375,7 +374,6 @@
 			packages = packages,
 			uselib = uselib,
 			source = ctx.path.ant_glob('tests/common/*.vala') + ctx.path.ant_glob('tests/mock/*.vala'),
-			threading = True,
 			install_path = None,
 			install_binding = False,
 			vapi_dirs = ['vapi', 'external/vala-0.22']
@@ -389,7 +387,6 @@
 			source = ctx.path.ant_glob('tests/uidemo/*.vala'),
 			includes = ['src/diorite', 'src'],
 			vala_defines = vala_defines,
-			threading = True,
 			install_path = None,
 			vapi_dirs = ['vapi', 'external/vala-0.22']
 		)
@@ -403,7 +400,6 @@
 				source = ctx.path.ant_glob('tests/main/*.vala'),
 				includes = ['src/diorite', 'src'],
 				vala_defines = vala_defines,
-				threading = True,
 				install_path = None,
 				vapi_dirs = ['vapi', 'external/vala-0.22']
 			)
@@ -417,7 +413,6 @@
 				source = ctx.path.ant_glob('tests/interactive/*.vala'),
 				includes = ['src/diorite', 'src'],
 				vala_defines = vala_defines,
-				threading = True,
 				install_path = None,
 				vapi_dirs = ['vapi', 'external/vala-0.22']
 			)