From dd4701fb6114f4cdcf0cf6c3bc92ae85acffaf1c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 2 Jul 2012 13:27:28 +0000 Subject: [PATCH] clean up test for libcurl, but better git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12981 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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})