Split pgf-server into pgf-fcgi and pgf-http.

The dependency on the fastcgi package made pgf-server difficult to compile, so
it is now split into

  - pgf-fgci (main module in pgf-fcgi.hs), which is built only if fastcgi is
    already installed or if you turn on the fastcgi flag (e.g. by doing
    'cabal install -f fastcgi').

  - pgf-http (main module in pgf-http.hs) which is always built (and hopefully
    has no problematic dependencies.) 

The modules FastCGIUtils and PGFService no longer depend on fastcgi.

1 files changed, 42 insertions, 11 deletions

diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal
index 3f061f24d..8551f0e51 100644
--- a/src/server/gf-server.cabal
+++ b/src/server/gf-server.cabal
@@ -6,7 +6,21 @@ license: GPL
 license-file: LICENSE
 synopsis: FastCGI Server for Grammatical Framework
 
-executable pgf-server
+flag fastcgi
+  Description: Build pgf-fcgi (requires the fastcgi package)
+  Default:     True
+
+executable pgf-fcgi
+  main-is: pgf-fcgi.hs
+  other-modules: PGFService FastCGIUtils Cache URLEncoding
+  ghc-options: -threaded
+
+  if flag(fastcgi)
+    build-depends: fastcgi >= 3001.0.2.2
+    buildable: True
+  else
+    buildable: False
+
   build-depends: base >=4.2 && <5,
                  old-time,
                  directory,
@@ -15,26 +29,43 @@ executable pgf-server
                  process,
                  gf >= 3.1,
                  cgi >= 3001.1.8.0,
-                 fastcgi >= 3001.0.2.2,
-                 httpd-shed,
                  network,
                  json >= 0.3.3,
                  utf8-string >= 0.3.1.1,
                  bytestring,
                  pretty,
                  random
-  if !os(windows)
+  if os(windows)
+    ghc-options: -optl-mwindows
+  else
     build-depends: unix
-  main-is: PGFService.hs
-  other-modules:
-    FastCGIUtils
-    Cache
-    URLEncoding
-    RunHTTP
-    ServeStaticFile
+
+
+executable pgf-http
+  main-is: pgf-http.hs
+  other-modules: PGFService FastCGIUtils Cache URLEncoding
+                 RunHTTP ServeStaticFile
   ghc-options: -threaded
+
+  build-depends: base >=4.2 && <5,
+                 old-time,
+                 directory,
+                 filepath,
+                 containers,
+                 process,
+                 gf >= 3.1,
+                 cgi >= 3001.1.8.0,
+                 httpd-shed,
+                 network,
+                 json >= 0.3.3,
+                 utf8-string >= 0.3.1.1,
+                 bytestring,
+                 pretty,
+                 random
   if os(windows)
     ghc-options: -optl-mwindows
+  else
+    build-depends: unix
 
 executable content-server
   buildable: False