From 41fcb3d852d756ed218f3458af1ff9c7ae6d0e1d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 26 Jun 2012 09:15:47 -0400 Subject: Version build dependency on STM, and allow building without it, which disables the watch command. --- GitAnnex.hs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'GitAnnex.hs') 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] -- cgit v1.2.3