Browse Source

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

tags/v1.9.11-RC1
Karl Lindén 10 years ago
parent
commit
ad24b255be
2 changed files with 5 additions and 10 deletions
  1. +0
    -5
      common/wscript
  2. +5
    -5
      wscript

+ 0
- 5
common/wscript View File

@@ -6,11 +6,6 @@ import re
import os import os


def configure(conf): 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_NETLIB'] = conf.is_defined('HAVE_SAMPLERATE')
conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE') conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE')




+ 5
- 5
wscript View File

@@ -491,6 +491,11 @@ def configure(conf):
# configure all auto options # configure all auto options
configure_auto_options(conf) 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') conf.sub_config('common')
if conf.env['IS_LINUX']: if conf.env['IS_LINUX']:
conf.sub_config('linux') conf.sub_config('linux')
@@ -499,11 +504,6 @@ def configure(conf):
if conf.env['BUILD_JACKDBUS'] != True: if conf.env['BUILD_JACKDBUS'] != True:
conf.fatal('jackdbus was explicitly requested but cannot be built') 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.sub_config('example-clients')


conf.env['LIB_PTHREAD'] = ['pthread'] conf.env['LIB_PTHREAD'] = ['pthread']


Loading…
Cancel
Save