From d8627637a5b35b888cc73f7a38b24d642dde5256 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 5 May 2012 20:04:30 +0000 Subject: 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 --- libs/surfaces/wscript | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libs/surfaces/wscript') 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') -- cgit v1.2.3