diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-07-02 13:26:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-07-02 13:26:04 +0000 |
| commit | 8fb57f3b16a9faf74e8aab0825f2ed02c8162b5e (patch) | |
| tree | 3ffcc79dfdbbc1571f612312a9f8973f071fc3bb | |
| parent | 1275817417523f7b9b9553a684c1be9757128298 (diff) | |
clean up test for libcurl
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12980 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/SConstruct b/SConstruct index e379e71ef3..3e2834e385 100644 --- a/SConstruct +++ b/SConstruct @@ -530,22 +530,12 @@ if env['FFT_ANALYSIS']: conf.Finish() if env['FREESOUND']: - # - # Check for curl header as well as the library - # - + if conf.CheckPKGVersion('libcurl', '7.0.0'): + print 'FREESOUND support cannot be built without the development libraries for CURL 7.X.X or later' + env['FREESOUND'] = 0; + else: libraries['curl'] = LibraryInfo() - - conf = Configure(libraries['curl']) - - if conf.CheckHeader ('curl/curl.h') == False: - print ('Ardour cannot be compiled without the curl headers, which do not seem to be installed') - sys.exit (1) - else: - libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl') - conf.Finish() -else: - print 'FREESOUND support is not enabled. Build with \'scons FREESOUND=1\' to enable.' + libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl') if env['LV2']: conf = env.Configure(custom_tests = { 'CheckPKGVersion' : CheckPKGVersion}) |