update servant build flag
make it work when building w/o assistant
This commit is contained in:
parent
6596fe80ec
commit
fdb888a56a
2 changed files with 5 additions and 3 deletions
|
@ -55,7 +55,7 @@ buildFlags = filter (not . null)
|
||||||
#ifdef WITH_SERVANT
|
#ifdef WITH_SERVANT
|
||||||
, "Servant"
|
, "Servant"
|
||||||
#else
|
#else
|
||||||
#warning Building without servant, no git-annex p2phttp.
|
#warning Building without servant, will not support annex+http urls or git-annex p2phttp.
|
||||||
#endif
|
#endif
|
||||||
#ifdef WITH_BENCHMARK
|
#ifdef WITH_BENCHMARK
|
||||||
, "Benchmark"
|
, "Benchmark"
|
||||||
|
|
|
@ -174,7 +174,7 @@ Flag Crypton
|
||||||
Description: Use the crypton library rather than the no longer maintained cryptonite
|
Description: Use the crypton library rather than the no longer maintained cryptonite
|
||||||
|
|
||||||
Flag Servant
|
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
|
Flag Benchmark
|
||||||
Description: Enable benchmarking
|
Description: Enable benchmarking
|
||||||
|
@ -319,7 +319,9 @@ Executable git-annex
|
||||||
Build-Depends:
|
Build-Depends:
|
||||||
servant,
|
servant,
|
||||||
servant-server,
|
servant-server,
|
||||||
servant-client
|
servant-client,
|
||||||
|
warp (>= 3.2.8),
|
||||||
|
warp-tls (>= 3.2.2)
|
||||||
CPP-Options: -DWITH_SERVANT
|
CPP-Options: -DWITH_SERVANT
|
||||||
Other-Modules:
|
Other-Modules:
|
||||||
Command.P2PHttp
|
Command.P2PHttp
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue