5 files changed, 29 insertions, 18 deletions

diff --git a/hmatrix.cabal b/hmatrix.cabal
index c8b307b..06fc12b 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.4.1.0
+Version:            0.5.0.0
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -25,14 +25,14 @@ flag mkl
     description:    Link with Intel's MKL optimized libraries.
     default:        False
 
-flag gsl
-    description:    Link with GSL unoptimized blas.
-    default:        False
-
 flag unsafe
     description: Compile the library with bound checking disabled.
     default: False
 
+flag no-workaround
+    description:    Expose the NaN problem
+    default: False
+
 library
     if flag(splitBase)
       build-depends:    base >= 3, array, QuickCheck, HUnit, storable-complex
@@ -101,21 +101,32 @@ library
     C-sources:          lib/Data/Packed/Internal/auxi.c,
                         lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c,
                         lib/Numeric/GSL/gsl-aux.c
+
+    ghc-prof-options:   -auto-all
+
+    if flag(unsafe)
+        cpp-options: -DUNSAFE
+
+    if arch(i386) && !flag(no-workaround) && !flag(mkl)
+        cpp-options: -DWORKAROUND
+
     if flag(mkl)
       if arch(x86_64)
         extra-libraries:   gsl mkl_lapack mkl_intel_lp64 mkl_sequential mkl_core
       else
         extra-libraries:   gsl mkl_lapack mkl_intel mkl_sequential mkl_core
     else
-      if flag(gsl)
-        extra-libraries:  gsl gslcblas lapack
-      else
-        extra-libraries:  gsl lapack
 
-    ghc-prof-options:   -auto-all
+        extra-libraries: gsl lapack
 
-    if flag(unsafe)
-        cpp-options: -DUNSAFE
+        -- Include here additional libraries if they are
+        -- required by your system to link -lgsl -llapack
+        -- Examples:
 
-    if arch(i386)
-        cpp-options: -DWORKAROUND
+            -- blas                       -- (cblas included in blas), not required in ubuntu/debian,
+                                          -- automatically linked by lapack
+
+            -- gslcblas                   -- nonoptimized cblas in gsl
+
+            -- f77blas cblas atlas gcc_s  -- for atlas-lapack in Arch Linux
+            -- blas gslcblas gfortran     -- for normal blas and lapack in Arch Linux
diff --git a/lib/Numeric/GSL/Special/Internal.hsc b/lib/Numeric/GSL/Special/Internal.hsc
index e0744d7..96c1f40 100644
--- a/lib/Numeric/GSL/Special/Internal.hsc
+++ b/lib/Numeric/GSL/Special/Internal.hsc
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi #-}
+ {-# LANGUAGE ForeignFunctionInterface #-}
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.GSL.Special.Internal
diff --git a/lib/Numeric/LinearAlgebra.hs b/lib/Numeric/LinearAlgebra.hs
index c14d4e4..cc2c1d3 100644
--- a/lib/Numeric/LinearAlgebra.hs
+++ b/lib/Numeric/LinearAlgebra.hs
@@ -16,7 +16,6 @@ module Numeric.LinearAlgebra (
     module Data.Packed,
     module Numeric.LinearAlgebra.Linear,
     module Numeric.LinearAlgebra.Algorithms,
-    module Numeric.LinearAlgebra.Instances,
     module Numeric.LinearAlgebra.Interface
 ) where
 
diff --git a/lib/Numeric/LinearAlgebra/Instances.hs b/lib/Numeric/LinearAlgebra/Instances.hs
index 91467ad..147537d 100644
--- a/lib/Numeric/LinearAlgebra/Instances.hs
+++ b/lib/Numeric/LinearAlgebra/Instances.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
+{-# LANGUAGE UndecidableInstances, FlexibleInstances #-}
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.LinearAlgebra.Instances
@@ -188,3 +188,4 @@ instance (Storable a) => Monoid (Vector a) where
     mconcat = j . filter ((>0).dim)
         where j [] = mempty
               j l  = join l
+
diff --git a/lib/Numeric/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index 1bf8b04..3af9960 100644
--- a/lib/Numeric/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
+{-# LANGUAGE UndecidableInstances, MultiParamTypeClasses, FlexibleInstances #-}
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.LinearAlgebra.Linear