From 6cec3db82d6e17e413e771ad0e3aab156bafbc1b Mon Sep 17 00:00:00 2001 From: "Paul J. Davis" Date: Tue, 22 Nov 2011 11:52:43 -0600 Subject: Make cURL a soft dependency This makes sure that we only optionally require the same version of cURL that CouchDB does. --- couchjs/c_src/SConscript | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'couchjs') diff --git a/couchjs/c_src/SConscript b/couchjs/c_src/SConscript index 451c03d3..68ad5d3e 100644 --- a/couchjs/c_src/SConscript +++ b/couchjs/c_src/SConscript @@ -52,7 +52,6 @@ if not env.GetOption('clean'): require_lib('m') require_lib('pthread') - require_lib('curl') require_lib('nspr4') ## check for SpiderMonkey development header @@ -94,6 +93,16 @@ if not env.GetOption('clean'): else: conf.Define("JSSCRIPT_TYPE", "JSObject*") + ## Check if curl is available + try: + vsn = runcmd("curl-config --version")[1] + vsn = vsn.split()[-1].strip().split(".") + vsn = tuple(map(int, vsn)) + if vsn > (7, 18, 0): + require_lib('curl') + except: + pass + ## Define properties for -h / -V (_, vsn) = runcmd("git describe --match 1.*") -- cgit v1.2.3