diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-19 17:00:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-19 17:00:21 +0000 |
| commit | 4bbfb6bffd3ecdf41bb3c8b73a0ca2eb000d7feb (patch) | |
| tree | 3acec8c1cd1ef4cff211825d3bd97a37fc020512 | |
| parent | 27cf4b989cc1d03ecb8c3629aeb9f592a6b3ea9f (diff) | |
revert FFT_ANALYSIS=1, add check for fftw3.h if FFT_ANALYSIS==1
git-svn-id: svn://localhost/ardour2/trunk@1232 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 497b2b84e1..f0c7f3fe0f 100644 --- a/SConstruct +++ b/SConstruct @@ -34,7 +34,7 @@ opts.AddOptions( EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), - BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 1), + BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), BoolOption('LIBLO', 'Compile with support for liblo library', 1), BoolOption('NLS', 'Set to turn on i18n support', 1), @@ -234,7 +234,8 @@ def i18n (buildenv, sources, installenv): def fetch_svn_revision (path): - cmd = "svn info " + cmd = "LANG= " + cmd += "svn info " cmd += path cmd += " | awk '/^Revision:/ { print $2}'" return commands.getoutput (cmd) @@ -463,6 +464,13 @@ libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') if env['FFT_ANALYSIS']: libraries['fftw3f'] = LibraryInfo() libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') + # + # Check for fftw3 header as well as the library + conf = Configure (libraries['fftw3f']) + if conf.CheckHeader ('fftw3.h') == False: + print "FFT Analysis cannot be compiled without the FFTW3 headers, which don't seem to be installed" + sys.exit (1) + libraries['fftw3f'] = conf.Finish(); libraries['jack'] = LibraryInfo() libraries['jack'].ParseConfig('pkg-config --cflags --libs jack') |