make configure -Wall clean

Build/Configure.hs

@@ -3,20 +3,14 @@
 module Build.Configure where
 
 import System.Directory
-import Data.List
-import System.Process
 import Control.Applicative
-import System.FilePath
 import System.Environment (getArgs)
-import Data.Maybe
 import Control.Monad.IfElse
 import Control.Monad
-import Data.Char
 
 import Build.TestConfig
 import Build.Version
 import Utility.SafeCommand
-import Utility.Monad
 import Utility.ExternalSHA
 import Utility.Env
 import qualified Git.Version

Build/DesktopFile.hs

@@ -24,9 +24,7 @@ import System.Directory
 import System.Environment
 #ifndef mingw32_HOST_OS
 import System.Posix.User
-import System.Posix.Files
 #endif
-import System.FilePath
 import Data.Maybe
 
 systemwideInstall :: IO Bool

Build/TestConfig.hs

@@ -7,8 +7,6 @@ import Utility.Monad
 import Utility.SafeCommand
 
 import System.IO
-import System.Cmd
-import System.Exit
 import System.FilePath
 import System.Directory
 

Setup.hs

@@ -16,15 +16,14 @@ import System.Directory
 import qualified Build.DesktopFile as DesktopFile
 import qualified Build.Configure as Configure
 
+main :: IO ()
 main = defaultMainWithHooks simpleUserHooks
-	{ preConf = configure
+	{ preConf = \_ _ -> do
+		Configure.run Configure.tests
+		return (Nothing, [])	
 	, postInst = myPostInst
 	}
 
-configure _ _ = do
-	Configure.run Configure.tests
-	return (Nothing, [])
-
 myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
 myPostInst _ (InstallFlags { installVerbosity }) pkg lbi = do
 	installGitAnnexShell dest verbosity pkg lbi
@@ -57,7 +56,7 @@ installManpages copyDest verbosity pkg lbi =
 	manpages    = ["git-annex.1", "git-annex-shell.1"]
 
 installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
-installDesktopFile copyDest verbosity pkg lbi =
+installDesktopFile copyDest _verbosity pkg lbi =
 	DesktopFile.install $ dstBinDir </> "git-annex"
   where
 	dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest