update servant build flag

make it work when building w/o assistant

diff --git a/BuildFlags.hs b/BuildFlags.hs
index 8526be4b99746865b94caabc49d4f5678e8d8d80..d273c216e45e9163e96d233e0ae56dae3009a404 100644 (file)
--- a/BuildFlags.hs
+++ b/BuildFlags.hs
@@ -55,7 +55,7 @@ buildFlags = filter (not . null)
 #ifdef WITH_SERVANT
        , "Servant"
 #else
-#warning Building without servant, no git-annex p2phttp.
+#warning Building without servant, will not support annex+http urls or git-annex p2phttp.
 #endif
 #ifdef WITH_BENCHMARK
        , "Benchmark"

diff --git a/git-annex.cabal b/git-annex.cabal
index f1709f44b3e64d5445e33bee7c4bdc6add8a86d2..aefbc41b6a28f68671c09e7bbd6826b3d1936048 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -174,7 +174,7 @@ Flag Crypton
   Description: Use the crypton library rather than the no longer maintained cryptonite
 
 Flag Servant
-  Description: Use the servant library, enabling git-annex p2phttp
+  Description: Use the servant library, enabling using annex+http urls and git-annex p2phttp
 
 Flag Benchmark
   Description: Enable benchmarking
@@ -319,7 +319,9 @@ Executable git-annex
     Build-Depends:
       servant,
       servant-server,
-      servant-client
+      servant-client,
+      warp (>= 3.2.8),
+      warp-tls (>= 3.2.2)
     CPP-Options: -DWITH_SERVANT
     Other-Modules:
       Command.P2PHttp