add build dep on network-info
This commit is contained in:
parent
01b908aea8
commit
24bfabe263
4 changed files with 8 additions and 6 deletions
2
Makefile
2
Makefile
|
@ -5,7 +5,7 @@ BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtil
|
|||
|
||||
# If you get build failures due to missing haskell libraries,
|
||||
# you can turn off some of these features.
|
||||
FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_OLD_YESOD -DWITH_MULTICAST
|
||||
FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_OLD_YESOD -DWITH_PAIRING
|
||||
|
||||
bins=git-annex
|
||||
mans=git-annex.1 git-annex-shell.1
|
||||
|
|
1
debian/control
vendored
1
debian/control
vendored
|
@ -39,6 +39,7 @@ Build-Depends:
|
|||
libghc-hamlet-dev,
|
||||
libghc-clientsession-dev,
|
||||
libghc-network-multicast-dev,
|
||||
libghc-network-info-dev,
|
||||
ikiwiki,
|
||||
perlmagick,
|
||||
git,
|
||||
|
|
|
@ -66,6 +66,7 @@ libraries. To build and use git-annex by hand, you will need:
|
|||
* [hamlet](http://hackage.haskell.org/package/hamlet)
|
||||
* [clientsession](http://hackage.haskell.org/package/clientsession)
|
||||
* [network-multicast](http://hackage.haskell.org/package/network-multicast)
|
||||
* [network-info](http://hackage.haskell.org/package/network-info)
|
||||
* Shell commands
|
||||
* [git](http://git-scm.com/)
|
||||
* [uuid](http://www.ossp.org/pkg/lib/uuid/)
|
||||
|
|
|
@ -40,8 +40,8 @@ Flag Assistant
|
|||
Flag Webapp
|
||||
Description: Enable git-annex webapp
|
||||
|
||||
Flag Multicast
|
||||
Description: Enable multicast pairing
|
||||
Flag Pairing
|
||||
Description: Enable pairing
|
||||
|
||||
Executable git-annex
|
||||
Main-Is: git-annex.hs
|
||||
|
@ -85,9 +85,9 @@ Executable git-annex
|
|||
template-haskell, yesod-default (>= 1.1.0), data-default
|
||||
CPP-Options: -DWITH_WEBAPP
|
||||
|
||||
if flag(Multicast) && flag(Webapp)
|
||||
Build-Depends: network-multicast
|
||||
CPP-Options: -DWITH_MULTICAST
|
||||
if flag(Pairing) && flag(Webapp)
|
||||
Build-Depends: network-multicast, network-info
|
||||
CPP-Options: -DWITH_PAIRING
|
||||
|
||||
if os(darwin)
|
||||
CPP-Options: -DOSX
|
||||
|
|
Loading…
Reference in a new issue