$NetBSD$

--- gtk2_ardour/SConscript.orig	2010-01-27 09:12:39.000000000 +0000
+++ gtk2_ardour/SConscript
@@ -47,6 +47,7 @@ gtkardour.Merge ([
     libraries['midi++2'],
     libraries['pangomm'],
     libraries['pbd'],
+    libraries['raptor'],
     libraries['samplerate'],
     libraries['sigc2'],
     libraries['sndfile'],
@@ -82,6 +83,9 @@ if gtkardour['FREESOUND']:
 	gtkardour.Merge ([libraries['curl']])
 	gtkardour.Append(CCFLAGS='-DFREESOUND')
 
+if gtkardour['LIBLO']:
+        gtkardour.Merge([libraries['lo']])
+
 if gtkardour['RUBBERBAND']:
 	gtkardour.Merge ([ libraries['rubberband'] ])
 else:
@@ -490,19 +494,19 @@ if env['NLS']:
 	i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
     
 # configuration files
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_theme))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_sae_theme))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_sae_theme))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae.menus'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ergonomic-us.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'mnemonic-us.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de-keypad.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-us-keypad.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de-nokeypad.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-us-nokeypad.bindings'))
+env.Alias('install', env.Install(config_prefix, ardour_dark_theme))
+env.Alias('install', env.Install(config_prefix, ardour_light_theme))
+env.Alias('install', env.Install(config_prefix, ardour_dark_sae_theme))
+env.Alias('install', env.Install(config_prefix, ardour_light_sae_theme))
+env.Alias('install', env.Install(config_prefix, 'ardour2_ui_default.conf'))
+env.Alias('install', env.Install(config_prefix, 'ardour.menus'))
+env.Alias('install', env.Install(config_prefix, 'ardour-sae.menus'))
+env.Alias('install', env.Install(config_prefix, 'ergonomic-us.bindings'))
+env.Alias('install', env.Install(config_prefix, 'mnemonic-us.bindings'))
+env.Alias('install', env.Install(config_prefix, 'SAE-de-keypad.bindings'))
+env.Alias('install', env.Install(config_prefix, 'SAE-us-keypad.bindings'))
+env.Alias('install', env.Install(config_prefix, 'SAE-de-nokeypad.bindings'))
+env.Alias('install', env.Install(config_prefix, 'SAE-us-nokeypad.bindings'))
 # data files
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files))