From 32aee1bb3e0cfc420963eff2f8bd50a6f4f5ed79 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 27 Feb 2013 02:30:26 -0400
Subject: [PATCH] add android flag; misc other flag fixes

Stopped checking the assistant flag for flags like webapp and xmpp,
because cabal disables the assistant if the other flag's dependencies
cannot be satisfied.
---
 git-annex.cabal | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/git-annex.cabal b/git-annex.cabal
index 416dbfa643..d4298612e0 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -53,7 +53,11 @@ Flag DNS
   Description: Enable the haskell DNS library for DNS lookup
 
 Flag Production
-  Description: Enable production build
+  Description: Enable production build (slower build; faster binary)
+
+Flag Android
+  Description: Building for Android
+  Default: False
 
 Executable git-annex
   Main-Is: git-annex.hs
@@ -82,13 +86,13 @@ Executable git-annex
     Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
     CPP-Options: -DWITH_WEBDAV
 
-  if flag(Assistant)
-    Build-Depends: async
-
   if flag(Assistant) && ! os(windows) && ! os(solaris)
-    Build-Depends: stm >= 2.3
+    Build-Depends: async, stm (>= 2.3)
     CPP-Options: -DWITH_ASSISTANT
 
+  if flag(Android)
+    CPP-Options: -D__ANDROID__
+
   if os(linux) && flag(Inotify)
     Build-Depends: hinotify
     CPP-Options: -DWITH_INOTIFY
@@ -105,22 +109,22 @@ Executable git-annex
     Build-Depends: dbus (>= 0.10.3)
     CPP-Options: -DWITH_DBUS
 
-  if flag(Webapp) && flag(Assistant)
+  if flag(Webapp)
     Build-Depends: yesod, yesod-static, case-insensitive,
      http-types, transformers, wai, wai-logger, warp, blaze-builder,
-     crypto-api, hamlet, clientsession, aeson, yesod-form (>= 1.2.0),
-     template-haskell, yesod-default (>= 1.1.0), data-default
+     crypto-api, hamlet, clientsession, aeson, yesod-form,
+     template-haskell, yesod-default, data-default
     CPP-Options: -DWITH_WEBAPP
 
-  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(XMPP) && flag(Assistant) && flag(DNS)
+  if flag(DNS)
     Build-Depends: dns
     CPP-Options: -DWITH_DNS