From d496f9c43bd97ec915a748505e745780b89dfba2 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Tue, 15 Apr 2008 12:08:50 +1000 Subject: [PATCH] Check for that required dependencies fftw3 and fftw3f with the rest of the required deps This means printing out useful error message rather than a KeyError The version of fftw3 required is set to 3.1 which was released on 26th Jan 2006 --- SConstruct | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/SConstruct b/SConstruct index 157c387..48f3a99 100644 --- a/SConstruct +++ b/SConstruct @@ -450,7 +450,9 @@ deps = \ 'raptor' : '1.4.2', 'lrdf' : '0.4.0', 'jack' : '0.101.1', - 'libgnomecanvas-2.0' : '2.0' + 'libgnomecanvas-2.0' : '2.0', + 'fftw3' : '3.1', + 'fftw3f' : '3.1' } def DependenciesRequiredMessage(): @@ -513,17 +515,11 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') libraries['samplerate'] = LibraryInfo() libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') -conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) +libraries['fftw3f'] = LibraryInfo() +libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') -if conf.CheckPKGExists ('fftw3f'): - libraries['fftw3f'] = LibraryInfo() - libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') - -if conf.CheckPKGExists ('fftw3'): - libraries['fftw3'] = LibraryInfo() - libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3') - -env = conf.Finish () +libraries['fftw3'] = LibraryInfo() +libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3') if env['FFT_ANALYSIS']: # -- 1.5.4.1