From: Robin Gareus Date: Sun, 23 Oct 2016 22:51:51 +0000 (+0200) Subject: Fix HIDAPI optional (python: False vs 'False') X-Git-Tag: 5.5~279 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=53e9337eba17236550cee4c04cec41bcaf204fcf;p=ardour.git Fix HIDAPI optional (python: False vs 'False') --- diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript index cf95c8c71d..2cb4a5f3f6 100644 --- a/libs/hidapi/wscript +++ b/libs/hidapi/wscript @@ -24,10 +24,12 @@ def configure(conf): else: if conf.env['build_target'] == 'mingw': conf.check (compiler='cxx', lib='setupapi', mandatory=True, uselib_store='SETUPAPI') - conf.define ('HAVE_HIDAPI', conf.is_defined('HAVE_SETUPAPI')) + if conf.is_defined('HAVE_SETUPAPI'): + conf.define ('HAVE_HIDAPI', 1) elif re.search ("linux", sys.platform) != None: autowaf.check_pkg(conf, 'libudev', uselib_store='UDEV', mandatory=False) - conf.define ('HAVE_HIDAPI', conf.is_defined('HAVE_UDEV')) + if conf.is_defined('HAVE_UDEV'): + conf.define ('HAVE_HIDAPI', 1) else: conf.define ('HAVE_HIDAPI', 1) conf.load('compiler_c')