summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-12 12:19:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-12 12:19:48 -0400
commit672a4323b5711352c1d1f45176cf97d96df97de3 (patch)
treea4fb7ba12eb25e353add5b3b0523eda223c566cc /git-annex.cabal
parentc5801f029458a899fb681d89628303433119c1c9 (diff)
quick fix to build with old warp-tls
Debian stable's warp-tls is too old to support the new https feature well, so only use http with that old version. Note that the webapp still depends on warp-tls, because the TLSSettings type is used.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 2f3b7a2eb..a98e3e34a 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -43,6 +43,9 @@ Flag Assistant
Flag Webapp
Description: Enable git-annex webapp
+Flag Webapp-https
+ Description: Enable git-annex webapp https
+
Flag Pairing
Description: Enable pairing
@@ -180,6 +183,9 @@ Executable git-annex
blaze-builder, crypto-api, hamlet, clientsession,
template-haskell, data-default, aeson, network-conduit
CPP-Options: -DWITH_WEBAPP
+ if flag(Webapp) && flag (Webapp-https)
+ Build-Depends: warp-tls (>= 1.4)
+ CPP-Options: -DWITH_WEBAPP_HTTPS
if flag(Pairing)
Build-Depends: network-multicast, network-info