clean up test for libcurl, but better
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Jul 2012 13:27:28 +0000 (13:27 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Jul 2012 13:27:28 +0000 (13:27 +0000)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12981 d708f5d6-7413-0410-9779-e7cbd77b26cf

SConstruct

index 3e2834e385746d13cb67e2c4b0c74da364effcca..d1c30d26d36f4e56d919d36927dab8b0a38d6ffa 100644 (file)
@@ -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})