diff options
author | Joey Hess <joey@kitenet.net> | 2014-04-08 16:19:34 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-04-08 16:19:34 -0400 |
commit | b0b20ce110977cab89e320451e44032df1077db5 (patch) | |
tree | 6ebfc4085020df2ca9213b49e3febe0e47047940 | |
parent | 844abdb460f89d1ffca71715ce58e5b2ccc0fc15 (diff) | |
parent | f47646dc36e9e97aa70af88a17c3c56a109ca601 (diff) |
Merge branch 'fix/build-without-Webapp-Quvi' of https://github.com/frasertweedale/git-annex
-rw-r--r-- | Annex.hs | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE GeneralizedNewtypeDeriving, PackageImports #-} +{-# LANGUAGE CPP, GeneralizedNewtypeDeriving, PackageImports #-} module Annex ( Annex, @@ -63,7 +63,9 @@ import Types.DesktopNotify import Types.CleanupActions import qualified Data.Map as M import qualified Data.Set as S +#ifdef WITH_QUVI import Utility.Quvi (QuviVersion) +#endif {- git-annex's monad is a ReaderT around an AnnexState stored in a MVar. - This allows modifying the state in an exception-safe fashion. @@ -117,7 +119,9 @@ data AnnexState = AnnexState , useragent :: Maybe String , errcounter :: Integer , unusedkeys :: Maybe (S.Set Key) +#ifdef WITH_QUVI , quviversion :: Maybe QuviVersion +#endif , existinghooks :: M.Map Git.Hook.Hook Bool , desktopnotify :: DesktopNotify } @@ -160,7 +164,9 @@ newState c r = AnnexState , useragent = Nothing , errcounter = 0 , unusedkeys = Nothing +#ifdef WITH_QUVI , quviversion = Nothing +#endif , existinghooks = M.empty , desktopnotify = mempty } |