diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-07 19:44:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-07 19:44:20 -0400 |
| commit | 24bfabe263204192acea3a1e9bb991111a8154a4 (patch) | |
| tree | 1fe5f634269a75e4e826fa7ddc1c3462f506ac29 | |
| parent | 01b908aea825f017adc566910ab0aa9a6c30774f (diff) | |
add build dep on network-info
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | doc/install.mdwn | 1 | ||||
| -rw-r--r-- | git-annex.cabal | 10 |
4 files changed, 8 insertions, 6 deletions
@@ -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 diff --git a/debian/control b/debian/control index da7ab1e70..72d84912b 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,7 @@ Build-Depends: libghc-hamlet-dev, libghc-clientsession-dev, libghc-network-multicast-dev, + libghc-network-info-dev, ikiwiki, perlmagick, git, diff --git a/doc/install.mdwn b/doc/install.mdwn index 92b0897f4..65ef07589 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -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/) diff --git a/git-annex.cabal b/git-annex.cabal index 4407be3c9..b7343bb63 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -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 |