diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-05 18:00:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-05 18:00:20 -0400 |
| commit | 5f16e6bfaf509cb387d9641bc73d7f1b2558dc7c (patch) | |
| tree | 11988c2ab9993d44259050b7f9ceef9997b075d6 | |
| parent | 730ca53d01dd7bb5d5f56e4ea759bf827ceb7e32 (diff) | |
Brought back the dbus and xmpp build flags, so build from source can be done without C libraries that may be hard to install.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 20 | ||||
| -rw-r--r-- | stack.yaml | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index d3a28c404..0b2f214a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ git-annex (6.20160127) UNRELEASED; urgency=medium is linked with libmagic. * matchexpression: Added --largefiles option to parse an annex.largefiles expression. + * Brought back the dbus and xmpp build flags, so build from source can be + done without C libraries that may be hard to install. -- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index a622a04e5..c40773f2e 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -84,6 +84,12 @@ Flag network-uri Flag Cryptonite Description: Use the cryptonite library, instead of the older cryptohash +Flag Dbus + Description: Enable dbus support + +Flag XMPP + Description: Enable notifications using XMPP + Executable git-annex Main-Is: git-annex.hs Build-Depends: @@ -181,9 +187,10 @@ Executable git-annex CPP-Options: -DWITH_KQUEUE C-Sources: Utility/libkqueue.c - if (os(linux)) - Build-Depends: dbus (>= 0.10.7), fdo-notify (>= 0.3) - CPP-Options: -DWITH_DBUS -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS + if flag(Dbus) + if (os(linux)) + 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 @@ -213,9 +220,10 @@ Executable git-annex Build-Depends: network-multicast, network-info CPP-Options: -DWITH_PAIRING - if (! os(windows)) - Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types - CPP-Options: -DWITH_XMPP + if flag(XMPP) + if (! os(windows)) + Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types + CPP-Options: -DWITH_XMPP if flag(TorrentParser) Build-Depends: torrent (>= 10000.0.0) diff --git a/stack.yaml b/stack.yaml index a2565cd52..a7660e02a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -12,8 +12,8 @@ flags: torrentparser: true webapp: true magicmime: false - xmpp: false dbus: false + xmpp: false android: false androidsplice: false ekg: false |