diff options
| author | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-03-28 14:10:13 +0000 |
|---|---|---|
| committer | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-03-28 14:10:13 +0000 |
| commit | dda1354ababe445ba423321f0bfa5cb57076f0ea (patch) | |
| tree | 72cbe1c64d7903baee3511ceb6cdf6ff00a0363a /wscript | |
| parent | 8efcb5d116ae47529d644143b8ca7d94d264910b (diff) | |
| download | jack2-dda1354ababe445ba423321f0bfa5cb57076f0ea.tar.gz | |
Fix for CELT and netjack1 in progress.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4227 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -129,23 +129,33 @@ def configure(conf): conf.fatal('jackdbus was explicitly requested but cannot be built') conf.sub_config('example-clients') - if conf.check_cfg(package='celt', atleast_version='0.8.0', args='--cflags --libs'): + if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs'): conf.define('HAVE_CELT', 1) + conf.define('HAVE_CELT_API_0_11', 1) + conf.define('HAVE_CELT_API_0_8', 0) + conf.define('HAVE_CELT_API_0_7', 0) + conf.define('HAVE_CELT_API_0_5', 0) + elif conf.check_cfg(package='celt', atleast_version='0.8.0', args='--cflags --libs'): + conf.define('HAVE_CELT', 1) + conf.define('HAVE_CELT_API_0_11', 0) conf.define('HAVE_CELT_API_0_8', 1) conf.define('HAVE_CELT_API_0_7', 0) conf.define('HAVE_CELT_API_0_5', 0) elif conf.check_cfg(package='celt', atleast_version='0.7.0', args='--cflags --libs'): conf.define('HAVE_CELT', 1) + conf.define('HAVE_CELT_API_0_11', 0) conf.define('HAVE_CELT_API_0_8', 0) conf.define('HAVE_CELT_API_0_7', 1) conf.define('HAVE_CELT_API_0_5', 0) elif conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs', required=True): conf.define('HAVE_CELT', 1) + conf.define('HAVE_CELT_API_0_11', 0) conf.define('HAVE_CELT_API_0_8', 0) conf.define('HAVE_CELT_API_0_7', 0) conf.define('HAVE_CELT_API_0_5', 1) else: conf.define('HAVE_CELT', 0) + conf.define('HAVE_CELT_API_0_11', 0) conf.define('HAVE_CELT_API_0_8', 0) conf.define('HAVE_CELT_API_0_7', 0) conf.define('HAVE_CELT_API_0_5', 0) |