From 09964033777ea206db0ff0a27f7928184c70c879 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Nov 2010 14:07:22 -0400 Subject: tweak --- configure.hs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.hs b/configure.hs index 56daf583a..d9ce60a14 100644 --- a/configure.hs +++ b/configure.hs @@ -9,6 +9,12 @@ type Test = IO Bool data TestDesc = TestDesc String String Test data Config = Config String Bool +instance Show Config where + show (Config key value) = unlines $ [ + key ++ " :: Bool" + , key ++ " = " ++ show value + ] + tests :: [TestDesc] tests = [ TestDesc "cp -a" "cp_a" $ testCp "-a" @@ -44,7 +50,7 @@ testEnd r = putStrLn $ " " ++ (show r) writeSysConfig :: [Config] -> IO () writeSysConfig config = do - writeFile "SysConfig.hs" $ unlines $ header ++ vars config ++ footer + writeFile "SysConfig.hs" $ unlines $ header ++ map show config ++ footer where header = [ "{- Automatically generated by configure. -}" @@ -52,13 +58,6 @@ writeSysConfig config = do , "" ] footer = [] - vars [] = [] - vars (c:cs) = showvar c ++ vars cs - showvar (Config name val) = [ - name ++ " :: Bool" - , name ++ " = " ++ show val - , "" - ] runTests :: [TestDesc] -> IO [Config] runTests [] = return [] -- cgit v1.2.3