X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=bf1a1024da3b3f96ca9cf30a2d382c72f5a9ab3b;hb=f1fd7f6fa47f0b86a7097a32e03129102ae0611a;hp=44192ad4ac5f0e28ba640698b42d630207e49c7c;hpb=f6055f2c6f3c0bf7ebe7c68f2243c0091f78a12f;p=ardour.git

diff --git a/wscript b/wscript
index 44192ad4ac..bf1a1024da 100644
--- a/wscript
+++ b/wscript
@@ -25,13 +25,14 @@ children = [
 	'libs/taglib',
 	'libs/rubberband',
 	'libs/surfaces',
-	'libs/musictime',
+	'libs/timecode',
 	'libs/ardour',
 	'libs/gtkmm2ext',
 	'libs/clearlooks-newer',
 	'libs/audiographer',
 	'libs/gnomecanvas',
-	'gtk2_ardour'
+	'gtk2_ardour',
+	'templates'
 ]
 
 i18n_children = [
@@ -371,11 +372,11 @@ 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', action='store', dest='windows_key', default='Mod4><Super',
-		       help='X Modifier(s) (Mod1,Mod2, etc) for the Windows key (X11 builds only). ' +
-		       'Multiple modifiers must be separated by \'><\'')
-        opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='',
+			help='X Modifier(s) (Mod1,Mod2, etc) for the Windows key (X11 builds only). ' +
+			'Multiple modifiers must be separated by \'><\'')
+	opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='',
 			help='directory where Boost header files can be found')		       
-        opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows',
+	opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows',
 			help='directory where Wine\'s Windows header files can be found')		       
 	for i in children:
 		opt.sub_options(i)
@@ -458,7 +459,7 @@ def configure(conf):
 	if Options.options.boost_sp_debug:
 		conf.env.append_value('CXXFLAGS_BOOST', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
 
-	autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION")
+	autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION", mandatory = False)
 
 	conf.check_cc(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
 		      execute = "1",
@@ -583,7 +584,7 @@ def build(bld):
         bld.path.find_dir ('libs/evoral/evoral')
         bld.path.find_dir ('libs/vamp-sdk/vamp-sdk')
         bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol')
-	bld.path.find_dir ('libs/musictime/musictime')
+        bld.path.find_dir ('libs/timecode/timecode')
         bld.path.find_dir ('libs/rubberband/rubberband')
         bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext')
         bld.path.find_dir ('libs/ardour/ardour')