merge 3.0 12308:12389

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12391 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-23 15:41:07 +00:00
parent 08c87b22b4
commit 89df06eb2d
88 changed files with 877 additions and 717 deletions

View file

@ -44,9 +44,9 @@ def configure(conf):
for i in children:
sub_config_and_use(conf, i)
autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
if Options.options.tranzport and conf.is_defined('HAVE_USB'):
conf.define('BUILD_TRANZPORT', 1)
#autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
#if Options.options.tranzport and conf.is_defined('HAVE_USB'):
# conf.define('BUILD_TRANZPORT', 1)
conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False)
autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24")