diff options
| author | David Robillard <d@drobilla.net> | 2011-09-29 20:29:06 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-09-29 20:29:06 +0000 |
| commit | 4ffe8418e3d3e2b9835f37e96bc9521f48b6b774 (patch) | |
| tree | 9a050125b4f82ffcddeb1d9076f5c01df61beb33 /libs/surfaces/wscript | |
| parent | c1ef7b14a3e1200817180cfaf6425e9bdf0eb51b (diff) | |
Use is_defined to check for HAVE_* variables set by checks.
Note that conf.define('FOO', 1) will NOT set conf.env['FOO'].
git-svn-id: svn://localhost/ardour2/branches/3.0@10164 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/wscript')
| -rw-r--r-- | libs/surfaces/wscript | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 034b588248..31ab783e48 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -45,7 +45,7 @@ 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') @@ -53,12 +53,12 @@ def configure(conf): conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC') 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) |