From 0234c29e0467aabf70304ef95375643455f7ff24 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Wed, 21 Sep 2011 13:00:29 +0000 Subject: fix Config.hs --- Config.hs | 4 ++-- THANKS | 3 +++ hmatrix.cabal | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Config.hs b/Config.hs index 3e83eff..2ea0fa8 100644 --- a/Config.hs +++ b/Config.hs @@ -40,7 +40,7 @@ opts = [ "" -- Ubuntu/Debian -- compile a simple program with symbols from GSL and LAPACK with the given libs testprog bInfo buildInfo libs fmks = - "echo \"#include \nint main(){zgesvd_(); gsl_sf_gamma(5);}\"" + "echo \"#include \nint main(){dgemm_(); zgesvd_(); gsl_sf_gamma(5);}\"" ++" > " ++ (buildDir bInfo) ++ "/dummy.c; gcc " ++ (join $ ccOptions buildInfo) ++ " " ++ (join $ cppOptions buildInfo) ++ " " @@ -90,7 +90,7 @@ try l i b f (opt:rest) = do else try l i b f rest -- read --configure-option=link:lib1,lib2,lib3,etc -linkop = "link:" +linkop = "--configure-option=link:" getUserLink = concatMap (g . drop (length linkop)) . filter (isPrefixOf linkop) where g = map cs cs ',' = ' ' diff --git a/THANKS b/THANKS index 6c794a6..0132938 100644 --- a/THANKS +++ b/THANKS @@ -100,3 +100,6 @@ module reorganization, monadic mapVectorM, and many other improvements. - Bas van Dijk fixed the import of vector >= 0.8, got rid of some deprecation warnings and used more explicit imports. +- Tom Nielsen discovered a problem in Config.hs, exposed by link problems + in Ubuntu 11.10 beta. + diff --git a/hmatrix.cabal b/hmatrix.cabal index 7c0eee6..51ed4dd 100644 --- a/hmatrix.cabal +++ b/hmatrix.cabal @@ -1,5 +1,5 @@ Name: hmatrix -Version: 0.12.0.0 +Version: 0.12.0.1 License: GPL License-file: LICENSE Author: Alberto Ruiz -- cgit v1.2.3