diff options
author | 2014-12-03 14:02:29 -0400 | |
---|---|---|
committer | 2014-12-03 14:10:52 -0400 | |
commit | 69957946eaa066406a243edca8fd3e19e7febfee (patch) | |
tree | 7ce300577cd986f4f03b5f81446a188916e75097 /git-annex.cabal | |
parent | ab9bb79e8f0eaa8d951d46e82b321f8511ded942 (diff) | |
parent | 718932c895b38228ab8aed4477d7ce8bba205e5a (diff) |
Merge branch 's3-aws'
Diffstat (limited to 'git-annex.cabal')
-rw-r--r-- | git-annex.cabal | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index a9472897c..cc5b6c884 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -34,6 +34,10 @@ Description: Flag S3 Description: Enable S3 support +Flag PatchedAWS + Description: Building on system, like Debian, with old AWS patched to support git-annex + Default: False + Flag WebDAV Description: Enable WebDAV support @@ -151,7 +155,11 @@ Executable git-annex CPP-Options: -DWITH_CRYPTOHASH if flag(S3) - Build-Depends: hS3 + Build-Depends: conduit, resourcet, conduit-extra + if flag(PatchedAWS) + Build-Depends: aws (>= 0.9.2) + else + Build-Depends: aws (>= 0.10.4) CPP-Options: -DWITH_S3 if flag(WebDAV) |