cleanup warnings

Ignore-this: 2c02c206960fa647f94e83751794ad21

darcs-hash:20101203223030-56c21-6dc8e1ab1fab61f450a96802a373743309314a0e

Author: dylex

Foreign/Matlab/Array/Auto.hs

@@ -13,7 +13,6 @@ module Foreign.Matlab.Array.Auto (
 import Foreign
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
 
 -- |A 'MXArray' that is automatically freed with 'Foreign.Matlab.Array.freeMXArray'
 newtype MXAuto a = MXAuto (ForeignPtr MXArrayType)

Foreign/Matlab/Array/IMX.hs

@@ -191,7 +191,7 @@ iMXData = imxd where
   imxd (IMXStruct f a) = do
     let ((r0,_),(r1,_)) = bounds a
     m <- createStruct (mRangeSize (r0,r1)) f
-    zipWithM (\i -> mStructSetFields m (mOffset i) <=< mapM iMXData) [0..] (segment (length f) (elems a))
+    zipWithM_ (\i -> mStructSetFields m (mOffset i) <=< mapM iMXData) [0..] (segment (length f) (elems a))
     return $ anyMXArray m
   imxd (IMXLogical a)	= imxa a return
   imxd (IMXChar a)	= imxa a return

Foreign/Matlab/Engine.hsc

@@ -22,7 +22,6 @@ import Foreign.C.Types
 import Data.List
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
 import Foreign.Matlab.Config
 
 #include <engine.h>

Foreign/Matlab/MAT.hsc

@@ -21,7 +21,6 @@ import Foreign.C.String
 import Foreign.C.Error
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
 
 #include <mat.h>
 

Foreign/Matlab/Runtime.hsc

@@ -16,7 +16,6 @@ module Foreign.Matlab.Runtime (
     mlGenericFeval
   ) where
 
-import Control.Monad
 import Foreign
 import Foreign.C.String
 import Foreign.C.Types
@@ -28,7 +27,6 @@ import System.FilePath
 import Foreign.Matlab.Config
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
 
 #include "hsc_sym.h"
 #include "libhsmatlab.h"

Foreign/Matlab/Runtime/Generic.hs

@@ -14,7 +14,6 @@ module Foreign.Matlab.Runtime.Generic (
     mlGenericCapture
   ) where
 
-import Control.Monad
 import Foreign.C.String
 --import System.FilePath
 import Foreign.Matlab.Util
@@ -61,7 +60,7 @@ mlGenericSetVar :: MLGeneric -> String -> MXArray a -> IO ()
 mlGenericSetVar mlg v x = do
   b <- createRowVector "base"
   v <- createRowVector v
-  mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
+  [] <- mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
   freeMXArray v
   freeMXArray b
 

configure.ac

@@ -1,5 +1,9 @@
 AC_INIT([Haskell Matlab interface], [0.1], [[email protected]])
 AC_CONFIG_SRCDIR([matlab.cabal])
+AC_ARG_WITH(compiler,
+	    [AC_HELP_STRING([--with-compiler=PATH], [])],
+	    [],
+	    [])
 AC_ARG_WITH(mcr,
 	    [AC_HELP_STRING([--with-mcr=PATH], [use Matlab Component Runtime installed in PATH @<:@default=no@:>@])],
 	    [],

matlab.buildinfo.in

@@ -1,3 +1,3 @@
 include-dirs: @srcdir@/src @MATLAB_DIR@/extern/include
 extra-lib-dirs: @MATLAB_LIB_PATH@
-ld-options: "-Wl,-rpath,@MATLAB_LIB_DIR@" "-Wl,--disable-new-dtags"
+ld-options: "-Wl,-rpath,@MATLAB_LIB_DIR@:@MATLAB_DIR@/runtime/@MATLAB_ARCH@" "-Wl,--disable-new-dtags"

matlab.cabal

@@ -8,7 +8,7 @@ Synopsis:	Matlab bindings and interface
 Description:	This package aims to provide a comprehensive interface to the MathWorks MATLAB(R) libraries and native data structures, including complete matrix access, MAT-format files, linking and execution of runtime libraries and engine.  Requires MATLAB for full functionality or an installed Matlab Component Runtime (MCR).  This has been tested with MATLAB 7.5-7.7 and might work with others.
 Category:	Foreign,Math
 build-type:	Custom
-tested-with:    GHC == 6.8.3
+tested-with:    GHC == 6.12.3
 extra-source-files: configure matlab.buildinfo.in Foreign/Matlab/Config.hs.in
 		src/Makefile.in src/hsmatlab.m src/hsmatlab.c src/hsc_sym.h
 		test/Makefile.in test/engine.hs test/runtime.hs test/generic.hs test/mtest.m test/hsmli.hs
@@ -24,7 +24,7 @@ Flag MCR
     default:		False
 
 Library
-    Build-depends:	base < 4, unix, array, filepath, Cabal
+    Build-depends:	base, unix, array, filepath, Cabal
     Exposed-modules:	Foreign.Matlab, Foreign.Matlab.Types, Foreign.Matlab.Array, Foreign.Matlab.Array.Auto, Foreign.Matlab.Array.MArray, Foreign.Matlab.Array.IMX, Foreign.Matlab.Array.Able, Foreign.Matlab.MAT
     if flag(engine)
         Exposed-modules: Foreign.Matlab.Engine