Resolve merge conflicts with paul-rouse#14

pjones · Oct 24, 2016 · 42e9711 · 42e9711
2 parents 5725ae4 + ac45c11
commit 42e9711
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Setup.hs b/Setup.hs
@@ -8,7 +8,7 @@
 #define MIN_VERSION_Cabal(x,y,z) 0 
 #endif
 
-import Control.Monad (liftM2, mplus)
+import Control.Monad (liftM, msum, sequence)
 import Data.List (isPrefixOf)
 import Distribution.PackageDescription
 import Distribution.Simple
@@ -41,13 +41,17 @@ main = defaultMainWithHooks simpleUserHooks {
 }
 
 mysqlConfigProgram = (simpleProgram "mysql_config") {
-    programFindLocation = \verbosity -> constOrId $ liftM2 mplus
+    programFindLocation = \verbosity -> constOrId $ liftM msum $ sequence
 #if MIN_VERSION_Cabal(1,24,0)
-      (findProgramOnSearchPath verbosity [ProgramSearchPathDefault] "mysql_config")
-      (findProgramOnSearchPath verbosity [ProgramSearchPathDefault] "mysql_config5")
+      [ (findProgramOnSearchPath verbosity [ProgramSearchPathDefault] "mysql_config")
+      , (findProgramOnSearchPath verbosity [ProgramSearchPathDefault] "mysql_config5")
+      , (findProgramOnSearchPath verbosity [ProgramSearchPathDefault] "mariadb_config")
+      ]
 #else
-      (findProgramLocation verbosity "mysql_config")
-      (findProgramLocation verbosity "mysql_config5")
+      [ (findProgramLocation verbosity "mysql_config")
+      , (findProgramLocation verbosity "mysql_config5")
+      , (findProgramLocation verbosity "mariadb_config")
+      ]
 #endif
   }