From cd141a9d57e67bb7c921d720807493f3b2c68cba Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 8 Aug 2010 02:20:45 +0000 Subject: [PATCH] Explicitly check for and link libcurl and the dl* functions; allows linking with gold. git-svn-id: svn://localhost/ardour2/branches/3.0@7567 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/wscript | 2 +- wscript | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index c97a6fcc01..6083628511 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -264,7 +264,7 @@ def build(bld): else: obj.target = 'ardour-3.0' obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA' + obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA CURL DL' obj.uselib += ' GTKMM GNOMECANVASMM OSX GTKOSX COREAUDIO' obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib''' diff --git a/wscript b/wscript index b27cb9e493..ca584987c1 100644 --- a/wscript +++ b/wscript @@ -498,6 +498,9 @@ def configure(conf): # Fix utterly braindead FLAC include path to not smash assert.h conf.env['CPPPATH_FLAC'] = [] + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='-ldl', uselib_store='DL') + conf.check_cc(function_name='curl_global_init', header_name='curl/curl.h', linkflags='-lcurl', uselib_store='CURL') + # Tell everyone that this is a waf build conf.env.append_value('CCFLAGS', '-DWAF_BUILD')