Update for latest LV2 #include style.

Enable building against system installed LV2 extensions.
Fix building slv2 and ingen independently.


git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2675 a436a847-0d15-0410-975c-d299462d15a1

6 files changed, 24 insertions, 23 deletions

diff --git a/hosts/event.lv2 b/hosts/event.lv2
deleted file mode 120000
index 5e8f78b..0000000
--- a/hosts/event.lv2
+++ /dev/null
@@ -1 +0,0 @@
-../../lv2/ext/event.lv2
\ No newline at end of file
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c
index 24a3042..1c8d50d 100644
--- a/hosts/lv2_jack_host.c
+++ b/hosts/lv2_jack_host.c
@@ -26,9 +26,9 @@
 #include <jack/jack.h>
 #include <jack/midiport.h>
 #include "slv2/slv2.h"
-#include "uri-map.lv2/uri-map.h"
-#include "event.lv2/event.h"
-#include "event.lv2/event-helpers.h"
+#include "lv2/lv2plug.in/ns/ext/event/event-helpers.h"
+#include "lv2/lv2plug.in/ns/ext/event/event.h"
+#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
 #include "jack_compat.h"
 
 #define MIDI_BUFFER_SIZE 1024
diff --git a/hosts/uri-map.lv2 b/hosts/uri-map.lv2
deleted file mode 120000
index 0c13eb8..0000000
--- a/hosts/uri-map.lv2
+++ /dev/null
@@ -1 +0,0 @@
-../../lv2/ext/uri-map.lv2
\ No newline at end of file
diff --git a/utils/event.lv2 b/utils/event.lv2
deleted file mode 120000
index 5e8f78b..0000000
--- a/utils/event.lv2
+++ /dev/null
@@ -1 +0,0 @@
-../../lv2/ext/event.lv2
\ No newline at end of file
diff --git a/utils/uri-map.lv2 b/utils/uri-map.lv2
deleted file mode 120000
index 0c13eb8..0000000
--- a/utils/uri-map.lv2
+++ /dev/null
@@ -1 +0,0 @@
-../../lv2/ext/uri-map.lv2
\ No newline at end of file
diff --git a/wscript b/wscript
index 84980a4..0db8e58 100644
--- a/wscript
+++ b/wscript
@@ -53,6 +53,7 @@ def set_options(opt):
 			help="Default LV2 path to use if $LV2_PATH is unset (globs and ~ supported)")
 
 def configure(conf):
+	conf.line_just = max(conf.line_just, 59)
 	autowaf.configure(conf)
 	autowaf.display_header('SLV2 Configuration')
 	conf.check_tool('compiler_cc')
@@ -76,10 +77,15 @@ def configure(conf):
 	conf.env['BUILD_TESTS'] = Options.options.build_tests
 	conf.env['BASH_COMPLETION'] = Options.options.bash_completion
 	conf.define('SLV2_DEFAULT_LV2_PATH', Options.options.default_lv2_path)
+
+	if conf.env['USE_JACK']:
+		autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event.h', 'HAVE_LV2_EVENT')
+		autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h', 'HAVE_LV2_URI_MAP')
+		conf.env['USE_JACK'] = conf.env['HAVE_LV2_EVENT'] and conf.env['HAVE_LV2_URI_MAP']
 	
 	conf.write_config_header('slv2-config.h')
 
-	autowaf.display_msg(conf, "Jack clients", str(conf.env['USE_JACK']))
+	autowaf.display_msg(conf, "Jack clients", str(conf.env['USE_JACK'] == 1))
 	autowaf.display_msg(conf, "Unit tests", str(conf.env['BUILD_TESTS']))
 	autowaf.display_msg(conf, "Dynamic Manifest Support", str(conf.env['SLV2_DYN_MANIFEST'] == 1))
 	autowaf.display_msg(conf, "Default LV2_PATH", str(conf.env['SLV2_DEFAULT_LV2_PATH']))
@@ -149,22 +155,21 @@ def build(bld):
 			obj.ccflags      = [ '-fprofile-arcs',  '-ftest-coverage' ]
 
 	# Utilities
-	utils = '''
-		utils/lv2_inspect
-		utils/lv2_list
-	'''
-	for i in utils.split():
-		obj = bld.new_task_gen('cc', 'program')
-		obj.source       = i + '.c'
-		obj.includes     = ['.', './src', './utils']
-		obj.uselib_local = 'libslv2'
-		obj.target       = i
-		obj.install_path = '${BINDIR}'
-
+	if bld.env['BUILD_UTILS']:
+		utils = '''
+			utils/lv2_inspect
+			utils/lv2_list
+		'''
+		for i in utils.split():
+			obj = bld.new_task_gen('cc', 'program')
+			obj.source       = i + '.c'
+			obj.includes     = ['.', './src', './utils']
+			obj.uselib_local = 'libslv2'
+			obj.target       = i
+			obj.install_path = '${BINDIR}'
+			
 	# JACK Hosts
-	hosts = '''
-		hosts/lv2_jack_host
-	'''
+	hosts = 'hosts/lv2_jack_host'
 	if bld.env['USE_JACK']:
 		for i in hosts.split():
 			obj = bld.new_task_gen('cc', 'program')