summaryrefslogtreecommitdiff
path: root/GitAnnex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-26 09:15:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-26 09:15:47 -0400
commit41fcb3d852d756ed218f3458af1ff9c7ae6d0e1d (patch)
tree8696e46240610e4bdab657d38b6209cf50914982 /GitAnnex.hs
parent6168795c1a92c509bbd16e29717d9a02afe8414c (diff)
Version build dependency on STM, and allow building without it, which disables the watch command.
Diffstat (limited to 'GitAnnex.hs')
-rw-r--r--GitAnnex.hs6
1 files changed, 6 insertions, 0 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs
index a4c5eb849..8dba5a3a7 100644
--- a/GitAnnex.hs
+++ b/GitAnnex.hs
@@ -5,6 +5,8 @@
- Licensed under the GNU GPL version 3 or higher.
-}
+{-# LANGUAGE CPP #-}
+
module GitAnnex where
import System.Console.GetOpt
@@ -58,7 +60,9 @@ import qualified Command.Import
import qualified Command.Map
import qualified Command.Upgrade
import qualified Command.Version
+#ifdef WITH_ASSISTANT
import qualified Command.Watch
+#endif
cmds :: [Command]
cmds = concat
@@ -100,7 +104,9 @@ cmds = concat
, Command.Map.def
, Command.Upgrade.def
, Command.Version.def
+#ifdef WITH_ASSISTANT
, Command.Watch.def
+#endif
]
options :: [Option]