Browse Source

add the --sndfile auto option and check sndfile availability with env['SNDFILE'] instead of is_defined('HAVE_SNDFILE')

tags/v1.9.11-RC1
Karl Lindén 10 years ago
parent
commit
bac7cc775d
2 changed files with 3 additions and 3 deletions
  1. +1
    -3
      example-clients/wscript
  2. +2
    -0
      wscript

+ 1
- 3
example-clients/wscript View File

@@ -36,8 +36,6 @@ example_libs = {
}

def configure(conf):
conf.check_cfg(package='sndfile', args='--cflags --libs', mandatory=False)
e = conf.check_cc(lib='readline', define_name="HAVE_READLINE", mandatory=False)

# define_name="HAVE_READLINE" has no effect, LIB_READLINE is defined if readline is available
@@ -46,7 +44,7 @@ def configure(conf):

conf.env['BUILD_EXAMPLE_CLIENT_TRANSPORT'] = bool(conf.env['LIB_READLINE'])

conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE')
conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.env['SNDFILE']

conf.env['BUILD_EXAMPLE_ALSA_IO'] = conf.env['SAMPLERATE'] and conf.env['BUILD_DRIVER_ALSA']



+ 2
- 0
wscript View File

@@ -431,6 +431,8 @@ def options(opt):
opus.add_package('opus', atleast_version='0.9.0')
samplerate = add_auto_option(opt, 'samplerate', help='Build with libsamplerate')
samplerate.add_package('samplerate')
sndfile = add_auto_option(opt, 'sndfile', help='Build with libsndfile')
sndfile.add_package('sndfile')

# dbus options
opt.sub_options('dbus')


Loading…
Cancel
Save