summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2011-09-21 13:00:29 +0000
committerAlberto Ruiz <aruiz@um.es>2011-09-21 13:00:29 +0000
commit0234c29e0467aabf70304ef95375643455f7ff24 (patch)
tree3386015fcf91b24ae733a9e723fceec15c4ccd98
parent3797b187d1747f1971c112084976fb2808fc87b0 (diff)
fix Config.hs
-rw-r--r--Config.hs4
-rw-r--r--THANKS3
-rw-r--r--hmatrix.cabal2
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
40 40
41-- compile a simple program with symbols from GSL and LAPACK with the given libs 41-- compile a simple program with symbols from GSL and LAPACK with the given libs
42testprog bInfo buildInfo libs fmks = 42testprog bInfo buildInfo libs fmks =
43 "echo \"#include <gsl/gsl_sf_gamma.h>\nint main(){zgesvd_(); gsl_sf_gamma(5);}\"" 43 "echo \"#include <gsl/gsl_sf_gamma.h>\nint main(){dgemm_(); zgesvd_(); gsl_sf_gamma(5);}\""
44 ++" > " ++ (buildDir bInfo) ++ "/dummy.c; gcc " 44 ++" > " ++ (buildDir bInfo) ++ "/dummy.c; gcc "
45 ++ (join $ ccOptions buildInfo) ++ " " 45 ++ (join $ ccOptions buildInfo) ++ " "
46 ++ (join $ cppOptions buildInfo) ++ " " 46 ++ (join $ cppOptions buildInfo) ++ " "
@@ -90,7 +90,7 @@ try l i b f (opt:rest) = do
90 else try l i b f rest 90 else try l i b f rest
91 91
92-- read --configure-option=link:lib1,lib2,lib3,etc 92-- read --configure-option=link:lib1,lib2,lib3,etc
93linkop = "link:" 93linkop = "--configure-option=link:"
94getUserLink = concatMap (g . drop (length linkop)) . filter (isPrefixOf linkop) 94getUserLink = concatMap (g . drop (length linkop)) . filter (isPrefixOf linkop)
95 where g = map cs 95 where g = map cs
96 cs ',' = ' ' 96 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.
100- Bas van Dijk fixed the import of vector >= 0.8, got rid of some 100- Bas van Dijk fixed the import of vector >= 0.8, got rid of some
101 deprecation warnings and used more explicit imports. 101 deprecation warnings and used more explicit imports.
102 102
103- Tom Nielsen discovered a problem in Config.hs, exposed by link problems
104 in Ubuntu 11.10 beta.
105
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 7c0eee6..51ed4dd 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
1Name: hmatrix 1Name: hmatrix
2Version: 0.12.0.0 2Version: 0.12.0.1
3License: GPL 3License: GPL
4License-file: LICENSE 4License-file: LICENSE
5Author: Alberto Ruiz 5Author: Alberto Ruiz