summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-07-02 13:27:28 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-07-02 13:27:28 +0000
commitdd4701fb6114f4cdcf0cf6c3bc92ae85acffaf1c (patch)
tree2d1ec4e677e3e722dfb09673752b68b3120f12bc
parent8fb57f3b16a9faf74e8aab0825f2ed02c8162b5e (diff)
clean up test for libcurl, but better
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12981 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--SConstruct5
1 files changed, 4 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 3e2834e385..d1c30d26d3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -530,12 +530,15 @@ if env['FFT_ANALYSIS']:
conf.Finish()
if env['FREESOUND']:
+ libraries['curl'] = LibraryInfo()
+ conf = env.Configure(custom_tests = { 'CheckPKGVersion' : CheckPKGVersion})
+
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()
libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl')
+ conf.Finish ()
if env['LV2']:
conf = env.Configure(custom_tests = { 'CheckPKGVersion' : CheckPKGVersion})