From 3fe1f56d3468c2eca2cdb68f8223636abaeb6904 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 24 Mar 2008 22:23:10 +0000 Subject: another tweak to libcurl detection git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3179 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 739c00ec7d..666e2b87b9 100644 --- a/SConstruct +++ b/SConstruct @@ -538,17 +538,18 @@ if env['FREESOUND']: # Check for curl header as well as the library # - conf = Configure(libraries['curl']) + libraries['curl'] = LibraryInfo() - 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) + 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'] = LibraryInfo() - libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl') - - conf.Finish() + libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl') + conf.Finish() +else: + print 'FREESOUND support is not enabled. Build with \'scons FREESOUND=1\' to enable.' if env['LV2']: conf = env.Configure(custom_tests = { 'CheckPKGExists' : CheckPKGExists }) -- cgit v1.2.3