diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-28 14:38:58 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-28 14:38:58 -0400 |
| commit | 65daf1723f28f275cec3ace753b34c87d51037e1 (patch) | |
| tree | 8f4d4f130bb9b6cab17fa7920502934b104489a3 /git-annex.cabal | |
| parent | 1ac524685440dd02428a192e2d074bb17f5f4806 (diff) | |
remove XMPP, DBus, DesktopNotify build flags
Make these features solely dependent on the OS being built on.
This lets stack build on windows w/o XMPP, on OSX w/o DBUS,
and on Linux with everything.
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index bbd3542fe..8cbc762c6 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -40,9 +40,6 @@ Flag WebDAV Flag Inotify Description: Enable inotify support -Flag Dbus - Description: Enable dbus support - Flag Assistant Description: Enable git-annex assistant and watch command @@ -55,9 +52,6 @@ Flag Webapp-secure Flag Pairing Description: Enable pairing -Flag XMPP - Description: Enable notifications using XMPP - Flag DNS Description: Enable the haskell DNS library for DNS lookup @@ -87,9 +81,6 @@ Flag Quvi Flag Tahoe Description: Enable the tahoe special remote -Flag DesktopNotify - Description: Enable desktop environment notifications - Flag TorrentParser Description: Use haskell torrent library to parse torrent files @@ -207,14 +198,8 @@ Executable git-annex C-Sources: Utility/libkqueue.c if (os(linux)) - if flag(Dbus) - Build-Depends: dbus (>= 0.10.7) - CPP-Options: -DWITH_DBUS - - if flag(DesktopNotify) - if flag(Dbus) - Build-Depends: dbus (>= 0.10.3), fdo-notify (>= 0.3) - CPP-Options: -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS + Build-Depends: dbus (>= 0.10.7), fdo-notify (>= 0.3) + CPP-Options: -DWITH_DBUS -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS if flag(Android) Build-Depends: data-endian @@ -246,7 +231,7 @@ Executable git-annex Build-Depends: network-multicast, network-info CPP-Options: -DWITH_PAIRING - if flag(XMPP) && (! os(windows)) + if (! os(windows)) Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types CPP-Options: -DWITH_XMPP |