diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-20 21:13:18 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-20 21:13:18 +0000 |
| commit | 339ff11a673aa234e9cd4cd1536db7089a2e1f6a (patch) | |
| tree | fac4c862a28fe33c7eb3f276005850b7937837cc /SConstruct | |
| parent | 2c46220ff153e15cfc447e852b4ef0043164efa4 (diff) | |
fix for systems without fftw3f
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2706 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index e2b34af5cd..b8728de5ea 100644 --- a/SConstruct +++ b/SConstruct @@ -479,11 +479,17 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') libraries['samplerate'] = LibraryInfo() libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') -libraries['fftw3f'] = LibraryInfo() -libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') +conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) -libraries['fftw3'] = LibraryInfo() -libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3') +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 () if env['FFT_ANALYSIS']: # @@ -741,7 +747,7 @@ libraries['vamp'] = LibraryInfo() env['RUBBERBAND'] = False -conf = Configure (libraries['vamp'], custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) +conf = libraries['vamp'].Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) if conf.CheckPKGExists('vamp-sdk'): have_vamp = True |