diff options
author | Joey Hess <joey@kitenet.net> | 2012-06-26 09:15:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-06-26 09:15:47 -0400 |
commit | 41fcb3d852d756ed218f3458af1ff9c7ae6d0e1d (patch) | |
tree | 8696e46240610e4bdab657d38b6209cf50914982 /git-annex.cabal | |
parent | 6168795c1a92c509bbd16e29717d9a02afe8414c (diff) |
Version build dependency on STM, and allow building without it, which disables the watch command.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r-- | git-annex.cabal | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index b43705793..f55940695 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120624 +Version: 3.20120625 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> @@ -31,13 +31,16 @@ Flag S3 Flag Inotify Description: Enable inotify support +Flag Assistant + Description: Enable git-annex assistant and watch command + Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, unix, containers, utf8-string, network, mtl, bytestring, old-locale, time, pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP, base == 4.5.*, monad-control, transformers-base, lifted-base, - IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, stm + IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance -- Need to list this because it's generated from a .hsc file. Other-Modules: Utility.Touch C-Sources: Utility/libdiskfree.c @@ -47,6 +50,10 @@ Executable git-annex Build-Depends: hS3 CPP-Options: -DWITH_S3 + if flag(Assistant) + Build-Depends: stm >= 2.3 + CPP-Options: -DWITH_ASSISTANT + if os(linux) && flag(Inotify) Build-Depends: hinotify CPP-Options: -DWITH_INOTIFY @@ -58,7 +65,7 @@ Test-Suite test unix, containers, utf8-string, network, mtl, bytestring, old-locale, time, pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP, base == 4.5.*, monad-control, transformers-base, lifted-base, - IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, stm + IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance Other-Modules: Utility.Touch C-Sources: Utility/libdiskfree.c Extensions: CPP |