Ensure that the newly selected track is visible on the canvas when scrolling through tracks with prev/next. Plus a cleaner check for wiimote deps.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4082 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 4 deletions

diff --git a/SConstruct b/SConstruct
index d841472956..e82bcdcca8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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']:
+libraries['usb'] = conf.Finish ()
+
+#
+# Check for wiimote dependencies
+
+if env['WIIMOTE']:
+    wiimoteConf = env.Configure ( )
+    if not wiimoteConf.CheckHeader('cwiid.h'):
 	print 'WIIIMOTE configured but you are missing libcwiid!'
         sys.exit(1)
+    if not wiimoteConf.CheckHeader('bluetooth/bluetooth.h'):
+        print 'WIIMOTE configured, but you are libbluetooth headers, which you need for libcwiid!'
+        sys.exit(1)
+    wiimoteConf.Finish()
 
-libraries['usb'] = conf.Finish ()
 
 #
 # Check for FLAC