Skip to content
This repository has been archived by the owner on Oct 22, 2021. It is now read-only.

Commit

Permalink
Make cURL a soft dependency
Browse files Browse the repository at this point in the history
This makes sure that we only optionally require the same version of cURL
that CouchDB does.
  • Loading branch information
davisp committed Nov 22, 2011
1 parent f2e2e77 commit 1cd3eb1
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion couchjs/c_src/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ if not env.GetOption('clean'):

require_lib('m')
require_lib('pthread')
require_lib('curl')
require_lib('nspr4')

## check for SpiderMonkey development header
Expand Down Expand Up @@ -93,6 +92,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.*")
Expand Down

0 comments on commit 1cd3eb1

Please sign in to comment.