summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-05 19:15:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-05 19:15:23 -0400
commit8f65283d969b2077bae0c22a67364a297168589d (patch)
tree9ac92710815f0363a666236d45e88cbc8f9bef89 /git-annex.cabal
parentcba098b5cd4688a3f3952b94fa978bdbb59a2de7 (diff)
temporarily disable webapp on windows; re-enable webdav on windows
The gcc response file should make it build with webdav (fingers crossed). webapp is waiting on a haskell platform upgrade on the autobuilder. Current one has a too old version of network for hxt to install.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 0c065e08d..0549ca026 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -124,7 +124,7 @@ Executable git-annex
Build-Depends: hS3
CPP-Options: -DWITH_S3
- if flag(WebDAV) && (! os(windows))
+ if flag(WebDAV)
Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
CPP-Options: -DWITH_WEBDAV
@@ -163,7 +163,7 @@ Executable git-annex
if flag(AndroidSplice)
CPP-Options: -DANDROID_SPLICES
- if flag(Webapp)
+ if flag(Webapp) (! os(windows))
Build-Depends:
yesod, yesod-default, yesod-static, yesod-form, yesod-core,
case-insensitive, http-types, transformers, wai, wai-logger, warp,