diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-16 11:29:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-16 11:29:43 -0400 |
| commit | 6cbf529b9b9dfa797e0c21c8226e6ea072a721c6 (patch) | |
| tree | d4c8130acc82f18728c2ca985474276b96f8857f /git-annex.cabal | |
| parent | 33b726f9a13e97d07e3a7309b8fa43f1ea75948a (diff) | |
Revert "avoid pulling in unneeded dependencies when the assistant is disabled"
Cabal does not seem to have a way to check if flag A is set and then, if
flag B is set, add a dep. Instead, it makes flag B get unset if the
dep is not available.
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 831aada96..47b301b2d 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -103,7 +103,7 @@ Executable git-annex Build-Depends: hS3 CPP-Options: -DWITH_S3 - if flag(WebDAV) && flag(Assistant) + if flag(WebDAV) Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types CPP-Options: -DWITH_WEBDAV @@ -117,8 +117,8 @@ Executable git-annex if flag(Assistant) if os(linux) && flag(Inotify) - Build-Depends: hinotify - CPP-Options: -DWITH_INOTIFY + Build-Depends: hinotify + CPP-Options: -DWITH_INOTIFY else if os(darwin) Build-Depends: hfsevents @@ -128,11 +128,11 @@ Executable git-annex CPP-Options: -DWITH_KQUEUE C-Sources: Utility/libkqueue.c - if os(linux) && flag(Dbus) && flag(Assistant) + if os(linux) && flag(Dbus) Build-Depends: dbus (>= 0.10.3) CPP-Options: -DWITH_DBUS - if flag(Webapp) && flag(Assistant) + if flag(Webapp) Build-Depends: yesod, yesod-default, yesod-static, yesod-form, yesod-core, case-insensitive, http-types, transformers, wai, wai-logger, warp, @@ -141,15 +141,15 @@ Executable git-annex CPP-Options: -DWITH_WEBAPP GHC-Options: -threaded - if flag(Pairing) && flag(WebApp) + if flag(Pairing) Build-Depends: network-multicast, network-info CPP-Options: -DWITH_PAIRING - if flag(XMPP) && flag(Assistant) + if flag(XMPP) Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types CPP-Options: -DWITH_XMPP - if flag(DNS) && flag(WebApp) + if flag(DNS) Build-Depends: dns CPP-Options: -DWITH_DNS |