Commit ad24b255 authored by Karl Lindén's avatar Karl Lindén
Browse files

move check for samplerate.h to before conf.sub_config('common') and remove the...

move check for samplerate.h to before conf.sub_config('common') and remove the duplicate check in common
parent 7f2bc7f0
......@@ -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')
......
......@@ -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']
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment