From dc36ebc08ea9a3f39a2012a5b2402ea3e3c9ace0 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Tue, 18 Feb 2014 09:26:26 +1100 Subject: [PATCH] Removed a configure dependancy on SOX for IIO. Removed a spurious initOK label in the driver_initialize function. --- linux/iio/JackIIODriver.cpp | 1 - linux/wscript | 3 --- 2 files changed, 4 deletions(-) diff --git a/linux/iio/JackIIODriver.cpp b/linux/iio/JackIIODriver.cpp index 99142d2c1..214604dbb 100644 --- a/linux/iio/JackIIODriver.cpp +++ b/linux/iio/JackIIODriver.cpp @@ -202,7 +202,6 @@ SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLocke if (ret!=NO_ERROR) goto initError; -initOK: // iio_driver ok, now create the threaded_driver threaded_driver = new Jack::JackThreadedDriver(iio_driver); if (threaded_driver) { bool capture=true, playback=false, monitor=false; diff --git a/linux/wscript b/linux/wscript index 76fb9267f..df2debec2 100644 --- a/linux/wscript +++ b/linux/wscript @@ -19,9 +19,6 @@ def configure(conf): conf.env['BUILD_DRIVER_IIO'] = conf.is_defined('HAVE_GTKIOSTREAM') conf.check_cfg(package='eigen3', atleast_version='3.1.2', args='--cflags --libs', mandatory=False) conf.env['BUILD_DRIVER_IIO'] += conf.is_defined('HAVE_EIGEN3') - conf.check_cfg(package='sox', atleast_version='14.4.0', args='--cflags --libs', mandatory=False) - conf.env['BUILD_DRIVER_IIO'] += conf.is_defined('HAVE_SOX') - def create_jack_driver_obj(bld, target, sources, uselib = None): driver = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])