summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-12 13:54:16 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-12 13:54:16 -0400
commite1e562fe87d6d99fe01d82a48fc259be5ee9867a (patch)
tree66607afdd9a81047b378ec1a9c76c29ee50a2241 /git-annex.cabal
parent4d49342612dd441cdc503b5294035fc05a9a5a77 (diff)
allow building without ascii-progress, since it is not ready yet
No progress bars with -J unless built with ascii-progress.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal11
1 files changed, 9 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index a67cc8ea5..cf9af63f7 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -93,6 +93,10 @@ Flag DesktopNotify
Flag TorrentParser
Description: Use haskell torrent library to parse torrent files
+Flag AsciiProgress
+ Description: Use ascii-progress library (experimental)
+ Default: False
+
Flag EKG
Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
Default: False
@@ -122,8 +126,7 @@ Executable git-annex
monad-control, transformers,
bloomfilter, edit-distance,
resourcet, http-conduit, http-types,
- esqueleto, persistent-sqlite, persistent, persistent-template,
- ascii-progress (<= 0.2.1.2), terminal-size
+ esqueleto, persistent-sqlite, persistent, persistent-template
CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs
Extensions: PackageImports
@@ -261,6 +264,10 @@ Executable git-annex
Build-Depends: torrent (>= 10000.0.0)
CPP-Options: -DWITH_TORRENTPARSER
+ if flag(AsciiProgress)
+ Build-Depends: ascii-progress (<= 0.2.1.2), terminal-size
+ CPP-Options: -DWITH_ASCIIPROGRESS
+
if flag(EKG)
Build-Depends: ekg
GHC-Options: -with-rtsopts=-T