diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:48:14 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:48:23 -0400 |
commit | 24590d731eba893cf11ce5651af6c47cb6f8d93f (patch) | |
tree | ef9e0d248e136cf22a391939c3b033d1b2710350 /git-annex.cabal | |
parent | eac4fed035aada22e0a0b5fde7fc7f8b4d1f14f0 (diff) |
Roll the dns build flag into the assistant build flag.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r-- | git-annex.cabal | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 1b2f82b74..91dc21ee8 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -46,9 +46,6 @@ Flag Webapp Flag Pairing Description: Enable pairing -Flag DNS - Description: Enable the haskell DNS library for DNS lookup - Flag Production Description: Enable production build (slower build; faster binary) @@ -165,6 +162,7 @@ Executable git-annex CPP-Options: -DWITH_WEBDAV if flag(Assistant) && ! os(solaris) + Build-Depends: dns CPP-Options: -DWITH_ASSISTANT if flag(Assistant) @@ -223,10 +221,6 @@ Executable git-annex if (! os(windows)) Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types CPP-Options: -DWITH_XMPP - - if flag(DNS) - Build-Depends: dns - CPP-Options: -DWITH_DNS if flag(TorrentParser) Build-Depends: torrent (>= 10000.0.0) |