projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass --hoogle to haddock; fixes trac #4521
[ghc-hetmet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
e89a2fe
..
a18f2f7
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-125,12
+125,7
@@
if test "$WithGhc" != ""; then
AC_SUBST(GhcPatchLevel)dnl
GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
AC_SUBST(GhcPatchLevel)dnl
GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
- FP_COMPARE_VERSIONS($GhcVersion,[-ge],[6.10.2],
- [ghc_ge_6102=YES], [ghc_ge_6102=NO])
- if test $GhcCanonVersion -ge 611; then ghc_ge_611=YES; else ghc_ge_611=NO; fi
if test $GhcCanonVersion -ge 613; then ghc_ge_613=YES; else ghc_ge_613=NO; fi
if test $GhcCanonVersion -ge 613; then ghc_ge_613=YES; else ghc_ge_613=NO; fi
- AC_SUBST(ghc_ge_6102)dnl
- AC_SUBST(ghc_ge_611)dnl
AC_SUBST(ghc_ge_613)dnl
fi
AC_SUBST(ghc_ge_613)dnl
fi
@@
-139,8
+134,8
@@
if test "$BootingFromHc" = "NO" -a -d "$srcdir/compiler"; then
if test "$WithGhc" = ""; then
AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
fi
if test "$WithGhc" = ""; then
AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
fi
- FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.10],
- [AC_MSG_ERROR([GHC version 6.10 or later is required to compile GHC.])])dnl
+ FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.12],
+ [AC_MSG_ERROR([GHC version 6.12 or later is required to compile GHC.])])dnl
if test `expr $GhcMinVersion % 2` = "1"; then
if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then
if test `expr $GhcMinVersion % 2` = "1"; then
if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then
@@
-400,6
+395,7
@@
then
test inplace/mingw -ot ghc-tarballs/mingw/libgmp*.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/libmpc*.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/libmpfr*.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/libgmp*.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/libmpc*.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/libmpfr*.tar.gz ||
+ test inplace/mingw -ot ghc-tarballs/mingw/libstdc*.tar.lzma ||
test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dev.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dll.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.lzma
test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dev.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dll.tar.gz ||
test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.lzma
@@
-415,6
+411,7
@@
then
tar --lzma -xf ../../ghc-tarballs/mingw/libgmp*.tar.lzma &&
tar --lzma -xf ../../ghc-tarballs/mingw/libmpc*.tar.lzma &&
tar --lzma -xf ../../ghc-tarballs/mingw/libmpfr*.tar.lzma &&
tar --lzma -xf ../../ghc-tarballs/mingw/libgmp*.tar.lzma &&
tar --lzma -xf ../../ghc-tarballs/mingw/libmpc*.tar.lzma &&
tar --lzma -xf ../../ghc-tarballs/mingw/libmpfr*.tar.lzma &&
+ tar --lzma -xf ../../ghc-tarballs/mingw/libstdc*.tar.lzma &&
tar -z -xf ../../ghc-tarballs/mingw/mingwrt*-dev.tar.gz &&
tar -z -xf ../../ghc-tarballs/mingw/mingwrt*-dll.tar.gz &&
tar --lzma -xf ../../ghc-tarballs/mingw/w32api*.tar.lzma &&
tar -z -xf ../../ghc-tarballs/mingw/mingwrt*-dev.tar.gz &&
tar -z -xf ../../ghc-tarballs/mingw/mingwrt*-dll.tar.gz &&
tar --lzma -xf ../../ghc-tarballs/mingw/w32api*.tar.lzma &&