import Configure.hs from Setup.lhs to be compiled with the same version of Cabal

4 files changed, 41 insertions, 10 deletions

diff --git a/configure.hs b/Config.hs
index bced948..d76a6a2 100644
--- a/configure.hs
+++ b/Config.hs
@@ -1,7 +1,4 @@
-#! /usr/bin/env runhaskell
-{- configure.hs for hmatrix
-   ------------------------
-
+{-
     GSL and LAPACK may require auxiliary libraries which depend on OS,
     distribution, and implementation. This script tries to to find out
     the correct link command for your system.
@@ -17,6 +14,8 @@
 
 -}
 
+module Config(config) where
+
 import System.Process
 import System.Exit
 import System.Environment
@@ -97,7 +96,7 @@ getUserLink = concatMap (g . drop (length linkop)) . filter (isPrefixOf linkop)
           cs ',' = ' '
           cs x   = x
 
-main = do
+config = do
     info <- maybeGetPersistBuildConfig "dist"
     case info of
         Nothing -> putStrLn "Please run \"cabal clean\" first." >> exitFailure
diff --git a/Setup.lhs b/Setup.lhs
index 3bce97b..17efee4 100644
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -2,7 +2,42 @@
 
 > import Distribution.Simple
 > import System.Process(system)
+>
+> import Config(config)
+>
+> import Distribution.Simple.Setup
+> import Distribution.PackageDescription
+> import Distribution.Simple.LocalBuildInfo
+> import Distribution.Simple.Command
+> import Distribution.PackageDescription.Parse
+> import Distribution.Simple.Utils(info)
+> import Distribution.Verbosity
+
+> main = do
+>    defaultMainWithHooks autoconfUserHooks {
+>        runTests = t, 
+>        postConf = modifiedPostConf }
+>   where modifiedPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+>         modifiedPostConf args flags pkg_descr lbi
+>              = do let verbosity = fromFlag (configVerbosity flags)
+>                   noExtraFlags args
+>
+>                   config
+>
+>                   pbi <- getHookedBuildInfo verbosity
+>                   let pkg_descr' = updatePackageDescription pbi pkg_descr
+>                   postConf simpleUserHooks args flags pkg_descr' lbi
+
+
+> getHookedBuildInfo :: Verbosity -> IO HookedBuildInfo
+> getHookedBuildInfo verbosity = do
+>   maybe_infoFile <- defaultHookedPackageDesc
+>   case maybe_infoFile of
+>     Nothing       -> return emptyHookedBuildInfo
+>     Just infoFile -> do
+>       info verbosity $ "Reading parameters from " ++ infoFile
+>       readHookedBuildInfo verbosity infoFile
 
-> main = defaultMainWithHooks autoconfUserHooks {runTests = t}
 
 > t _ _ _ _ = system ( "runhaskell examples/tests.hs") >> return()
+
diff --git a/configure b/configure
deleted file mode 100644
index b93aee9..0000000
--- a/configure
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-runhaskell configure.hs $*
\ No newline at end of file
diff --git a/hmatrix.cabal b/hmatrix.cabal
index b92cdd0..bd64998 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.11.0.2
+Version:            0.11.0.3
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz