From 68e8ea7d53d1846150f4bad1d76dac85d66767a0 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 1 Jul 2010 20:13:23 +0000
Subject: [PATCH] web: better web and webyesod flag and --version descriptions

---
 Hledger/Cli/Commands/All.hs | 9 +++------
 Hledger/Cli/Version.hs      | 6 +++---
 hledger.cabal               | 4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Hledger/Cli/Commands/All.hs b/Hledger/Cli/Commands/All.hs
index edb46d141..0d5140c48 100644
--- a/Hledger/Cli/Commands/All.hs
+++ b/Hledger/Cli/Commands/All.hs
@@ -20,8 +20,7 @@ module Hledger.Cli.Commands.All (
 #endif
 #if defined(WEB)
                      module Hledger.Cli.Commands.Web,
-#endif
-#if defined(WEBYESOD)
+#elif defined(WEBYESOD)
                      module Hledger.Cli.Commands.WebYesod,
 #endif
 #ifdef CHART
@@ -42,8 +41,7 @@ import Hledger.Cli.Commands.Vty
 #endif
 #if defined(WEB)
 import Hledger.Cli.Commands.Web
-#endif
-#if defined(WEBYESOD)
+#elif defined(WEBYESOD)
 import Hledger.Cli.Commands.WebYesod
 #endif
 #ifdef CHART
@@ -67,8 +65,7 @@ tests_Hledger_Commands = TestList
 -- #endif
 -- #if defined(WEB)
 --     ,Hledger.Cli.Commands.Web.tests_Web
--- #endif
--- #if defined(WEBYESOD)
+-- #elif defined(WEBYESOD)
 --     ,Hledger.Cli.Commands.WebYesod.tests_Web
 -- #endif
 -- #ifdef CHART
diff --git a/Hledger/Cli/Version.hs b/Hledger/Cli/Version.hs
index f79f6c360..13582b08b 100644
--- a/Hledger/Cli/Version.hs
+++ b/Hledger/Cli/Version.hs
@@ -70,8 +70,8 @@ configflags   = tail [""
   ,"vty"
 #endif
 #if defined(WEB)
-  ,"web (using simpleserver)"
-#elif defined(WEBHAPPSTACK)
-  ,"web (using happstack)"
+  ,"web (using loli/hsp/simpleserver)"
+#elif defined(WEBYESOD)
+  ,"web (using yesod/hamlet/simpleserver)"
 #endif
  ]
diff --git a/hledger.cabal b/hledger.cabal
index 45d62950f..e60f5a6b8 100644
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -40,11 +40,11 @@ flag vty
   default:     False
 
 flag web
-  description: enable the web ui (using loli, hack, simpleserver)
+  description: enable the web ui (using loli/hsp/simpleserver, works with ghc 6.10)
   default:     False
 
 flag webyesod
-  description: enable the web ui (using yesod, wai, simpleserver)
+  description: enable the web ui (using yesod/hamlet/simpleserver, requires ghc 6.12)
   default:     False
 
 flag chart