diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:14:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:14:57 -0400 |
| commit | 1d48e19b5a47df04abcce777e6543dabb17f2ce5 (patch) | |
| tree | b0309fcfb109009a47ebbd11c0ef5cdd7f0d1452 /Annex.hs | |
| parent | 86648b502149d32ee0f9af200e949e8240208a8c (diff) | |
remove 3 build flags
* Removed the webapp-secure build flag, rolling it into the webapp build
flag.
* Removed the quvi and tahoe build flags, which only adds aeson to
the core dependencies.
* Removed the feed build flag, which only adds feed to the core
dependencies.
Build flags have cost in both code complexity and also make Setup configure
have to work harder to find a usable set of build flags when some
dependencies are missing.
Diffstat (limited to 'Annex.hs')
| -rw-r--r-- | Annex.hs | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP, GeneralizedNewtypeDeriving, PackageImports, BangPatterns #-} +{-# LANGUAGE GeneralizedNewtypeDeriving, PackageImports, BangPatterns #-} module Annex ( Annex, @@ -62,9 +62,7 @@ import Types.LockCache import Types.DesktopNotify import Types.CleanupActions import qualified Database.Keys.Handle as Keys -#ifdef WITH_QUVI import Utility.Quvi (QuviVersion) -#endif import Utility.InodeCache import Utility.Url @@ -130,9 +128,7 @@ data AnnexState = AnnexState , errcounter :: Integer , unusedkeys :: Maybe (S.Set Key) , tempurls :: M.Map Key URLString -#ifdef WITH_QUVI , quviversion :: Maybe QuviVersion -#endif , existinghooks :: M.Map Git.Hook.Hook Bool , desktopnotify :: DesktopNotify , workers :: [Either AnnexState (Async AnnexState)] @@ -177,9 +173,7 @@ newState c r = AnnexState , errcounter = 0 , unusedkeys = Nothing , tempurls = M.empty -#ifdef WITH_QUVI , quviversion = Nothing -#endif , existinghooks = M.empty , desktopnotify = mempty , workers = [] |