Enable using ghc parallel version 3
authorGuido Trotter <ultrotter@google.com>
Thu, 9 Jun 2011 09:28:08 +0000 (10:28 +0100)
committerGuido Trotter <ultrotter@google.com>
Fri, 24 Jun 2011 14:19:20 +0000 (15:19 +0100)
Currently htools cannot be compiled under sid because the parallel
haskell library is version 3. Using it issues a few warning, but
compiles and passes unit tests. Ship it?

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

configure.ac

index 8baf2c3..5beefdc 100644 (file)
@@ -359,7 +359,11 @@ else
   AC_SUBST(GHC_PKG_CURL)
   AC_SUBST(HTOOLS_NOCURL)
   AC_MSG_CHECKING([parallel])
-  GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-2.*')
+  GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-3.*')
+  if test -z "$GHC_PKG_PARALLEL"
+  then
+    GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-2.*')
+  fi
   if test -z "$GHC_PKG_PARALLEL"
   then
     GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-1.*')