Fixes to compile with 6.5

configure

@@ -1450,7 +1450,7 @@ echo "$as_me: error: You need GHC to build this project" >&2;}
 fi;
 
 cat >>confdefs.h <<_ACEOF
-#define WITH_GHC $GHC
+#define WITH_GHC "$GHC"
 _ACEOF
 
 

configure.ac

@@ -84,7 +84,7 @@ AC_ARG_WITH(ghc,
     fi 
   ]
   )
-AC_DEFINE_UNQUOTED(WITH_GHC, $GHC, [Which ghc to use])
+AC_DEFINE_UNQUOTED(WITH_GHC, "$GHC", [Which ghc to use])
 AC_SUBST(GHC)
 
 # Work out value of __GLASGOW_HASKELL__

src/Language/Hi/FastString.hs

@@ -67,8 +67,8 @@ module Language.Hi.FastString
 
 import Language.Hi.PrimPacked
 
-import IO
-import Char             ( chr, ord )
+import System.IO
+import Data.Char             ( chr, ord )
 
 import GHC.Exts
 import GHC.IOBase

src/System/Plugins/ParsePkgConfCabal.y

@@ -39,8 +39,8 @@ import Distribution.InstalledPackageInfo
 import Distribution.Package
 import Distribution.Version
 
-import Char             ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
-import List             ( break )
+import Data.Char             ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
+import Data.List             ( break )
 
 }
 

src/plugins.cabal

@@ -32,6 +32,6 @@ exposed-modules:
 c-sources:
         Language/Hi/hschooks.c
 includes:	      Linker.h
-Build-Depends:        base, haskell-src-exts>=0.2, Cabal
+Build-Depends:        base, haskell98, Cabal, haskell-src-exts>=0.2
 ghc-options:          -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures -threaded