summaryrefslogtreecommitdiff
path: root/libs/surfaces/wscript
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-05-05 20:04:30 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-05-05 20:04:30 +0000
commitd8627637a5b35b888cc73f7a38b24d642dde5256 (patch)
tree0d73c47c2bd8a2582be8c9974710d8793562dd76 /libs/surfaces/wscript
parentffa2c2cf4069b12d2c981e6d1c8cbef6a8e163a2 (diff)
change detection system for liblo to use pkgconfig and test in only one place
git-svn-id: svn://localhost/ardour2/branches/3.0@12194 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/wscript')
-rw-r--r--libs/surfaces/wscript5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 5595eed44c..f281247208 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -48,9 +48,8 @@ def configure(conf):
if Options.options.tranzport and 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',mandatory=False)
- conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC',mandatory=False)
+ autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24")
if Options.options.wiimote:
conf.check_cc (header_name='cwiid.h', define_name='HAVE_CWIID_H')
@@ -67,7 +66,7 @@ def build(bld):
bld.recurse('control_protocol')
bld.recurse('generic_midi')
bld.recurse('mackie')
- if bld.is_defined ('BUILD_OSC'):
+ if bld.is_defined ('HAVE_LO'):
bld.recurse('osc')
if bld.is_defined('BUILD_POWERMATE'):
bld.recurse('powermate')