From ad24b255beccbd5031f86184c729948c9d42834e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Lind=C3=A9n?= Date: Fri, 10 Apr 2015 16:21:55 +0200 Subject: [PATCH] move check for samplerate.h to before conf.sub_config('common') and remove the duplicate check in common --- common/wscript | 5 ----- wscript | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/common/wscript b/common/wscript index 4302b1e2..bca070a5 100644 --- a/common/wscript +++ b/common/wscript @@ -6,11 +6,6 @@ import re import os def configure(conf): - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") - - if conf.is_defined('HAVE_SAMPLERATE'): - conf.env['LIB_SAMPLERATE'] = ['samplerate'] - conf.env['BUILD_NETLIB'] = conf.is_defined('HAVE_SAMPLERATE') conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE') diff --git a/wscript b/wscript index d4171731..05e081c0 100644 --- a/wscript +++ b/wscript @@ -491,6 +491,11 @@ def configure(conf): # configure all auto options configure_auto_options(conf) + conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") + + if conf.is_defined('HAVE_SAMPLERATE'): + conf.env['LIB_SAMPLERATE'] = ['samplerate'] + conf.sub_config('common') if conf.env['IS_LINUX']: conf.sub_config('linux') @@ -499,11 +504,6 @@ def configure(conf): if conf.env['BUILD_JACKDBUS'] != True: conf.fatal('jackdbus was explicitly requested but cannot be built') - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") - - if conf.is_defined('HAVE_SAMPLERATE'): - conf.env['LIB_SAMPLERATE'] = ['samplerate'] - conf.sub_config('example-clients') conf.env['LIB_PTHREAD'] = ['pthread']