more changes to wscript files to catch up with waf 1.6 and fix OS X issues

[ardour.git] / libs / surfaces / wscript

diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 034b588248be74eb813db31e050bf0442e34ec13..8bd59f5daf53e578f1fa8c730e8504ed51f2d7e5 100644 (file)
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -45,20 +45,20 @@ def configure(conf):
         sub_config_and_use(conf, i)
 
     autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
-    if conf.env['HAVE_USB']:
+    if conf.is_defined('HAVE_USB'):
         conf.define('BUILD_TRANZPORT', 1)
 
     #conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT')
-    conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE')
-    conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC')
+    conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False)
+    conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC',mandatory=False)
 
     if Options.options.wiimote:
-        conf.check_cc (header_name='cwiid.h',define_name='HAVE_CWIID_H')
-        if not conf.env['HAVE_CWIID_H']:
+        conf.check_cc (header_name='cwiid.h', define_name='HAVE_CWIID_H')
+        if not conf.is_defined('HAVE_CWIID_H'):
             print('WIIMOTE configured but you are missing libcwiid!')
             sys.exit(1)
-        conf.check_cc (header_name='bluetooth/bluetooth.h',define_name='HAVE_BLUETOOTH_H')
-        if not conf.env['HAVE_BLUETOOTH_H']:
+        conf.check_cc (header_name='bluetooth/bluetooth.h', define_name='HAVE_BLUETOOTH_H')
+        if not conf.is_defined('HAVE_BLUETOOTH_H'):
             print('WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!')
             sys.exit(1)
         conf.define ('BUILD_WIIMOTE', 1)
@@ -67,14 +67,14 @@ def build(bld):
     bld.recurse('control_protocol')
     bld.recurse('generic_midi')
     bld.recurse('mackie')
-    if bld.env['BUILD_OSC']:
-        bld.add_subdirs('osc')
-    if bld.env['BUILD_POWERMATE']:
-        bld.add_subdirs('powermate')
-    if bld.env['BUILD_WIIMOTE']:
-        bld.add_subdirs('wiimote')
-    if bld.env['BUILD_TRANZPORT']:
-        bld.add_subdirs('tranzport')
+    if bld.is_defined ('BUILD_OSC'):
+        bld.recurse('osc')
+    if bld.is_defined('BUILD_POWERMATE'):
+        bld.recurse('powermate')
+    if bld.is_defined('BUILD_WIIMOTE'):
+        bld.recurse('wiimote')
+    if bld.is_defined('BUILD_TRANZPORT'):
+        bld.recurse('tranzport')
 
 def shutdown():
     autowaf.shutdown()