fix to work with cabal 1.8

ryantm · Mar 2, 2010 · 02b3073 · 02b3073
1 parent 64ec63e
commit 02b3073
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Setup.lhs b/Setup.lhs
@@ -23,21 +23,19 @@ main = defaultMainWithHooks simpleUserHooks {
     return lbi {
       localPkgDescr = updatePackageDescription
                         (Just bi, []) (localPkgDescr lbi)
-    } 
+    }
 }
 
 mysqlConfigProgram = (simpleProgram "mysql_config") {
     programFindLocation = \verbosity -> do
-      mysql_config  <- findProgramOnPath "mysql_config"  verbosity 
+      mysql_config  <- findProgramOnPath "mysql_config"  verbosity
       mysql_config5 <- findProgramOnPath "mysql_config5" verbosity
       return (mysql_config `mplus` mysql_config5)
   }
 
 mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo
 mysqlBuildInfo lbi = do
-  (mysqlConfigProg, _) <- requireProgram verbosity
-                          mysqlConfigProgram AnyVersion (withPrograms lbi)
-  let mysqlConfig = rawSystemProgramStdout verbosity mysqlConfigProg
+  let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram (withPrograms lbi)
       ws = " \n\r\t"
 
   includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig ["--include"]