new region constructor for use by audiofilters (almost does a pure copy of the region...

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index d841472956ee544964d399ff71666655b139c98c..6f0f2a0d34755c97ea90b9d1f55ea7d38b311040 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -583,7 +583,7 @@ if env['WIIMOTE']:
        wiimote_surface = [ 'libs/surfaces/wiimote' ]
 else:
        wiimote_surface = [ ]
-       print 'WIIMOTE support not enabled. Build with \'scons WIIMOTE=1\' to enale.'
+       print 'WIIMOTE not enabled. Build with \'scons WIIMOTE=1\' to enable support.'
 
 libraries['jack'] = LibraryInfo()
 libraries['jack'].ParseConfig('pkg-config --cflags --libs jack')
@@ -907,13 +907,21 @@ if conf.CheckHeader('linux/input.h'):
 else:
     have_linux_input = False
 
-# let's continue checking, check for libcwiid
-if not conf.CheckHeader('cwiid.h'):
-    if env['WIIMOTE']:
-       print 'WIIIMOTE configured but you are missing libcwiid!'
+libraries['usb'] = conf.Finish ()
+
+#
+# Check for wiimote dependencies
+
+if env['WIIMOTE']:
+    wiimoteConf = env.Configure ( )
+    if not wiimoteConf.CheckHeader('cwiid.h'):
+       print 'WIIMOTE configured but you are missing libcwiid!'
+        sys.exit(1)
+    if not wiimoteConf.CheckHeader('bluetooth/bluetooth.h'):
+        print 'WIIMOTE configured but you are missing the libbluetooth headers which you need to compile wiimote support!'
         sys.exit(1)
+    wiimoteConf.Finish()
 
-libraries['usb'] = conf.Finish ()
 
 #
 # Check for FLAC