Merge branch 'master' into ghc_option

Check.hs

@@ -1,6 +1,7 @@
 module Check (checkSyntax) where
 
 import Cabal
+import CabalDev (modifyOptions)
 import Control.Applicative
 import CoreMonad
 import ErrMsg
@@ -12,7 +13,9 @@ import Types
 ----------------------------------------------------------------
 
 checkSyntax :: Options -> String -> IO String
-checkSyntax opt file = unlines <$> check opt file
+checkSyntax opt file = do
+  opt' <- modifyOptions opt
+  unlines <$> check opt' file
 
 ----------------------------------------------------------------