diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-02 20:41:40 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-02 20:41:40 +0000 |
| commit | 9e9fe1dfeba71289532e9240890a6f23ebcffe6d (patch) | |
| tree | 86b126eb329b91247b6431ec119622ebf3a9d715 /SConstruct | |
| parent | 6ff201fab2385416358bf4a8a46d616065e80163 (diff) | |
make AUBIO a non-optional dependency
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@9043 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 31de55a2cc..eda56354a2 100644 --- a/SConstruct +++ b/SConstruct @@ -61,7 +61,7 @@ opts.AddVariables( BoolVariable('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), BoolVariable('FREEDESKTOP', 'Install MIME type, icons and .desktop file as per the freedesktop.org spec (requires xdg-utils and shared-mime-info). "scons uninstall" removes associations in desktop database', 0), BoolVariable('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1), - BoolVariable('AUBIO', "Use Paul Brossier's aubio library for feature detection (if available)", 1), + BoolVariable('AUBIO', "Use Paul Brossier's aubio library for feature detection", 1), BoolVariable('AUSTATE', "Build with support for AU settings & presets saving/loading", 0) ) @@ -435,7 +435,8 @@ deps = \ 'lrdf' : '0.4.0', 'jack' : '0.109.0', 'libgnomecanvas-2.0' : '2.0', - 'sndfile' : '1.0.18' + 'sndfile' : '1.0.18', + 'aubio' : '0.3.0' } def DependenciesRequiredMessage(): @@ -499,9 +500,6 @@ if conf.CheckPKGExists ('fftw3'): if conf.CheckPKGExists ('aubio'): libraries['aubio'] = LibraryInfo() libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') - env['AUBIO'] = 1 -else: - env['AUBIO'] = 0 env = conf.Finish () |