web: better web and webyesod flag and --version descriptions

Hledger/Cli/Commands/All.hs

@@ -20,8 +20,7 @@ module Hledger.Cli.Commands.All (
 #endif
 #if defined(WEB)
                      module Hledger.Cli.Commands.Web,
-#endif
+#elif defined(WEBYESOD)
-#if 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
+#elif defined(WEBYESOD)
-#if 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
+-- #elif defined(WEBYESOD)
--- #if defined(WEBYESOD)
 --     ,Hledger.Cli.Commands.WebYesod.tests_Web
 -- #endif
 -- #ifdef CHART

Hledger/Cli/Version.hs

@@ -70,8 +70,8 @@ configflags   = tail [""
   ,"vty"
 #endif
 #if defined(WEB)
-  ,"web (using simpleserver)"
+  ,"web (using loli/hsp/simpleserver)"
-#elif defined(WEBHAPPSTACK)
+#elif defined(WEBYESOD)
-  ,"web (using happstack)"
+  ,"web (using yesod/hamlet/simpleserver)"
 #endif
  ]

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