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 /BuildFlags.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 'BuildFlags.hs')
| -rw-r--r-- | BuildFlags.hs | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/BuildFlags.hs b/BuildFlags.hs index e8ff06595..764af6df7 100644 --- a/BuildFlags.hs +++ b/BuildFlags.hs @@ -22,9 +22,6 @@ buildFlags = filter (not . null) #else #warning Building without the webapp. You probably need to install Yesod.. #endif -#ifdef WITH_WEBAPP_SECURE - , "Webapp-secure" -#endif #ifdef WITH_PAIRING , "Pairing" #else @@ -79,16 +76,6 @@ buildFlags = filter (not . null) #ifdef WITH_DNS , "DNS" #endif -#ifdef WITH_FEED - , "Feeds" -#else -#warning Building without Feeds. -#endif -#ifdef WITH_QUVI - , "Quvi" -#else -#warning Building without quvi. -#endif #ifdef WITH_TDFA , "TDFA" #endif @@ -98,4 +85,8 @@ buildFlags = filter (not . null) #ifdef WITH_EKG , "EKG" #endif + -- Always enabled now, but users may be used to seeing these flags + -- listed. + , "Feeds" + , "Quvi" ] |