diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-16 22:11:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-16 22:11:06 -0400 |
| commit | fb45fdc052b23f4b2210c71a03a14bdb5986098a (patch) | |
| tree | b61c6331bc7699669834600c09dcf1dc3dccd109 /libs/surfaces | |
| parent | 0da34e65e3470b1c2298ddf571df6356d0d42bd8 (diff) | |
| parent | c8b32e2f8bed225b8f5ceac130eea6632f595492 (diff) | |
fix conflicts and merge with master
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/wscript | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 335d14ee87..29edc427b2 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -55,9 +55,12 @@ def configure(conf): if conf.is_defined('HAVE_CWIID_H'): conf.check_cc (header_name='bluetooth/bluetooth.h', define_name='HAVE_BLUETOOTH_H',mandatory=False) if conf.is_defined('HAVE_BLUETOOTH_H'): - autowaf.check_pkg(conf, 'cwiid', uselib_store='CWIID', atleast_version='0.6.00') - conf.define ('BUILD_WIIMOTE', 1) - sub_config_and_use(conf, 'wiimote') + autowaf.check_pkg(conf, 'cwiid', uselib_store='CWIID', atleast_version='0.6.00',mandatory=False) + if conf.is_defined ('HAVE_CWIID'): + conf.define ('BUILD_WIIMOTE', 1) + sub_config_and_use(conf, 'wiimote') + else: + print('You have the cwiid headers needed to compile wiimote support BUT you are missing the pkg-config file for cwiid') else: print('You are missing the libbluetooth headers needed to compile wiimote support') else: |