From 6c122b67c4f0e391cfa78c96a26e1c96cab93b50 Mon Sep 17 00:00:00 2001 From: dons Date: Fri, 19 Aug 2005 00:52:51 +0000 Subject: [PATCH] Fixes to compile with 6.5 --- configure | 2 +- configure.ac | 2 +- src/Language/Hi/FastString.hs | 4 ++-- src/System/Plugins/ParsePkgConfCabal.y | 4 ++-- src/plugins.cabal | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 803b57f..54cc271 100644 --- a/configure +++ b/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 diff --git a/configure.ac b/configure.ac index 6bacc23..c6895ba 100644 --- a/configure.ac +++ b/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__ diff --git a/src/Language/Hi/FastString.hs b/src/Language/Hi/FastString.hs index e156d9c..6a23067 100644 --- a/src/Language/Hi/FastString.hs +++ b/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 diff --git a/src/System/Plugins/ParsePkgConfCabal.y b/src/System/Plugins/ParsePkgConfCabal.y index 022cdb4..ddd4516 100644 --- a/src/System/Plugins/ParsePkgConfCabal.y +++ b/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 ) } diff --git a/src/plugins.cabal b/src/plugins.cabal index ab2cb90..58f3c5d 100644 --- a/src/plugins.cabal +++ b/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