remove configure-time --no-lv2 option. LV2 is integral to what we do

9 files changed, 35 insertions, 45 deletions

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 0e10cd1f70..87238374d1 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -299,24 +299,23 @@ def configure(conf):
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
                       atleast_version='2.0')
 
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
-                          atleast_version='1.0.0', mandatory=True)
-        autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0',
-                          atleast_version='1.2.0', mandatory=False)
-        autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0',
-                          atleast_version='1.10.0', mandatory=False)
-        autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
-                          atleast_version='0.14.0', mandatory=True)
-        autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
-                          atleast_version='0.8.0', mandatory=True)
-        autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
-                          atleast_version='0.2.0', mandatory=True)
-        autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
-                          atleast_version='0.24.2', mandatory=False)
-        autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
-                          atleast_version='0.6.0', mandatory=False)
-        conf.define ('LV2_SUPPORT', 1)
+    autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
+                      atleast_version='1.0.0', mandatory=True)
+    autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0',
+                      atleast_version='1.2.0', mandatory=False)
+    autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0',
+                      atleast_version='1.10.0', mandatory=False)
+    autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
+                      atleast_version='0.14.0', mandatory=True)
+    autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
+                      atleast_version='0.8.0', mandatory=True)
+    autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
+                      atleast_version='0.2.0', mandatory=True)
+    autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
+                      atleast_version='0.24.2', mandatory=False)
+    autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
+                      atleast_version='0.6.0', mandatory=False)
+    conf.define ('LV2_SUPPORT', 1)
 
     # non-standard LV2 extention -- TODO: add option to disable??
     if conf.is_defined ('HAVE_LV2_1_10_0'):
diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript
index fcfe1dca39..fa71d2300a 100644
--- a/libs/plugins/a-comp.lv2/wscript
+++ b/libs/plugins/a-comp.lv2/wscript
@@ -15,10 +15,9 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
-                uselib_store='LV2_1_0_0')
-        autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
+    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+                      uselib_store='LV2_1_0_0')
+    autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
 
 def build(bld):
     bundle = 'a-comp.lv2'
diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript
index 5ce87deac8..be56763059 100644
--- a/libs/plugins/a-delay.lv2/wscript
+++ b/libs/plugins/a-delay.lv2/wscript
@@ -15,10 +15,9 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
-                uselib_store='LV2_1_0_0')
-        autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') 
+    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+                      uselib_store='LV2_1_0_0')
+    autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') 
 
 def build(bld):
     bundle = 'a-delay.lv2'
diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript
index 00edc9b1bc..36e9432499 100644
--- a/libs/plugins/a-eq.lv2/wscript
+++ b/libs/plugins/a-eq.lv2/wscript
@@ -15,10 +15,9 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
-                uselib_store='LV2_1_0_0')
-        autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') 
+    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+                      uselib_store='LV2_1_0_0')
+    autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') 
 
 def build(bld):
     bundle = 'a-eq.lv2'
diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript
index 554bee0a6a..46e3b4f69e 100644
--- a/libs/plugins/a-exp.lv2/wscript
+++ b/libs/plugins/a-exp.lv2/wscript
@@ -15,10 +15,9 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
-                uselib_store='LV2_1_0_0')
-        autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
+    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+                      uselib_store='LV2_1_0_0')
+    autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
 
 def build(bld):
     bundle = 'a-exp.lv2'
diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript
index 78d55eb896..088fe3d876 100644
--- a/libs/plugins/a-fluidsynth.lv2/wscript
+++ b/libs/plugins/a-fluidsynth.lv2/wscript
@@ -15,9 +15,8 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
-                uselib_store='LV2_1_0_0')
+    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+                      uselib_store='LV2_1_0_0')
 
 def build(bld):
     bundle = 'a-fluidsynth.lv2'
diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript
index ac14a2c4e8..e5657ad716 100644
--- a/libs/plugins/a-reverb.lv2/wscript
+++ b/libs/plugins/a-reverb.lv2/wscript
@@ -15,9 +15,8 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
-                uselib_store='LV2_1_0_0')
+    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+                      uselib_store='LV2_1_0_0')
 
 def build(bld):
     bundle = 'a-reverb.lv2'
diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript
index cedda4c308..4b51891af2 100644
--- a/libs/plugins/reasonablesynth.lv2/wscript
+++ b/libs/plugins/reasonablesynth.lv2/wscript
@@ -15,9 +15,8 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    if Options.options.lv2:
-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
-                uselib_store='LV2_1_0_0')
+    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+                      uselib_store='LV2_1_0_0')
 
 def build(bld):
     bundle = 'reasonablesynth.lv2'
diff --git a/wscript b/wscript
index d6d75d56ca..e5bb0e3bed 100644
--- a/wscript
+++ b/wscript
@@ -769,8 +769,6 @@ def options(opt):
                     help='Compile beatbox test app')
     opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
                     help='Compile with support for LV2 (if Lilv+Suil is available)')
-    opt.add_option('--no-lv2', action='store_false', dest='lv2',
-                    help='Do not compile with support for LV2')
     opt.add_option('--lv2dir', type='string', help="install destination for builtin LV2 bundles [Default: LIBDIR/lv2]")
     opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst',
                     help='Compile with support for linuxVST plugins')