3 files changed, 8 insertions, 2 deletions

diff --git a/Config.hs b/Config.hs
index d76a6a2..8810bec 100644
--- a/Config.hs
+++ b/Config.hs
@@ -142,3 +142,4 @@ mainOk bInfo = do
                 if g
                     then ""
                     else "cc-options: -DGSL110\n"
+
diff --git a/THANKS b/THANKS
index c6a8264..98be94e 100644
--- a/THANKS
+++ b/THANKS
@@ -91,3 +91,6 @@ module reorganization, monadic mapVectorM, and many other improvements.
 - Carter Schonwald helped with the configuration for Homebrew OS X and
   found a tolerance problem in test "1E5 rots".
 
+- Duncan Coutts reported a problem with configure.hs and contributed
+  a solution.
+
diff --git a/hmatrix.cabal b/hmatrix.cabal
index dd1a6b3..f9387e2 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -21,7 +21,7 @@ Description:        Purely functional interface to basic linear algebra
                     .
                     - "Numeric.LinearAlgebra": everything + instances of standard Haskell numeric classes
 Category:           Math
-tested-with:        GHC ==6.10.4, GHC ==6.12.1, GHC ==6.12.3
+tested-with:        GHC ==6.10.4, GHC ==6.12.1, GHC ==6.12.3, GHC ==7.0.1, GHC==7.0.2
 
 cabal-version:      >=1.6
 
@@ -164,12 +164,14 @@ library
     if impl(ghc < 6.10.2)
         cpp-options: -DFINIT
 
+    if impl(ghc >= 7.0.1)
+        cpp-options: -DFINIT
+
     if flag(finit)
         cpp-options: -DFINIT
 
     if impl(ghc == 7.0.1)
         cpp-options: -DNONORMVTEST
-        cpp-options: -DFINIT
 
     if flag(mkl)
       if arch(x86_64)