fixed .cabal for OSX, ack. to H. Apfelmus

2 files changed, 18 insertions, 19 deletions

diff --git a/README b/README
index bd6a7f0..4744f68 100644
--- a/README
+++ b/README
@@ -50,8 +50,8 @@ KNOWN PROBLEMS / BUGS -------------------------------
 
 ACKNOWLEDGEMENTS -----------------------------------------------------
 
-I thank Don Stewart, Henning Thielemann, Bulat Ziganshin and all the people
-in the Haskell mailing lists for their help.
+I thank Don Stewart, Henning Thielemann, Bulat Ziganshin, Heinrich Apfelmus,
+and all the people in the Haskell mailing lists for their help.
 
 - Nico Mahlo discovered a bug in the eigendecomposition wrapper.
 
@@ -109,3 +109,4 @@ in the Haskell mailing lists for their help.
 
 - Jean-Francois Tremblay discovered an error in the tutorial.
 
+- Heinrich Apfelmus fixed hmatrix.cabal for OS/X.
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 1080dcd..3d58fa2 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.8.3.0
+Version:            0.8.3.1
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -14,10 +14,11 @@ Category:           Math
 tested-with:        GHC ==6.10.4, GHC ==6.12.1
 
 cabal-version:      >=1.2
+
 build-type:         Custom
-extra-source-files: lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h
 
-extra-source-files: configure configure.hs README INSTALL CHANGES
+extra-source-files: lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h
+                    configure configure.hs README INSTALL CHANGES
 extra-tmp-files:    hmatrix.buildinfo
 
 extra-source-files: examples/tests.hs
@@ -47,28 +48,19 @@ extra-source-files: lib/Numeric/GSL/Special/auto.hs,
                     lib/Numeric/GSL/Special/autoall.sh,
                     lib/Numeric/GSL/Special/replace.hs
 
-flag splitBase
-    description:    Choose the new smaller, split-up base package.
-
 flag mkl
     description:    Link with Intel's MKL optimized libraries.
     default:        False
 
-flag accelerate
-    description:    Use the accelerate framework for LAPACK/BLAS on OS X
-    default:        False
-
 flag unsafe
     description:    Compile the library with bound checking disabled.
     default:        False
 
 library
-    if flag(splitBase)
-      build-depends:    base >= 3 && < 5, array
-    else
-      build-depends:    base < 3
 
-    Build-Depends:      haskell98,
+    Build-Depends:      base >= 3 && < 5,
+                        array,
+                        haskell98,
                         QuickCheck, HUnit,
                         storable-complex,
                         process
@@ -160,9 +152,11 @@ library
       else
         extra-libraries:   gsl mkl_lapack mkl_intel mkl_sequential mkl_core
 
-    if flag(accelerate)
-        frameworks: Accelerate
+    if os(OSX)
+        extra-lib-dirs: /opt/local/lib/
+        include-dirs: /opt/local/include
         extra-libraries: gsl
+        frameworks: Accelerate
 
 -- The extra-libraries required for GSL and LAPACK
 -- should now be automatically detected by configure(.hs)
@@ -170,3 +164,7 @@ library
     extra-libraries:
     extra-lib-dirs:
 
+    source-repository head
+        type:     darcs
+        location: http://code.haskell.org/hmatrix
+