X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=fb186ca3d40c372fa277eceff07e461ec329ca32;hb=cc7fd02d59c5b15f2aee8f3a420d3f6ee3048096;hp=5ba67073629971690864d73573007c0d60e9b5fb;hpb=93cd31711eea3dc9aa2ef8995e8ba054dabd87f0;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 5ba6707..fb186ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.11], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.13], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
@@ -126,7 +126,12 @@ if test "$WithGhc" != ""; then
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
   if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
+  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
   AC_SUBST(ghc_ge_609)dnl
+  AC_SUBST(ghc_ge_6102)dnl
+  AC_SUBST(ghc_ge_611)dnl
 fi
 
 dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
@@ -414,38 +419,6 @@ AC_ARG_WITH(ld,
 # This uses GHC, so put it after the "GHC is required" check above:
 FP_FIND_ROOT
 
-dnl ** Enable the construction of Win32 DLLs?
-dnl --------------------------------------------------------------
-dnl
-dnl [ The ability to build the RTS and libraries as separate DLLs used
-dnl   to be supported, but isn't currently (updates to the RTS, compiler
-dnl   and build system would be required to bring it back again.)
-dnl   Hence, exposing it as an option is false advertisement, so better
-dnl   disable it to avoid confusion (but leave it commented-out rather
-dnl   than removed in order to remind ourselves to bring back the
-dnl   feature at some stage.) ]
-dnl
-dnl AC_ARG_ENABLE(win32-dlls,
-dnl [  --enable-win32-dlls
-dnl         If on a Win32 platform running mingw32/cygwin, enable the
-dnl         construction of DLLs containing ghc-compiled code.
-dnl ],
-dnl [
-dnl case $HostOS_CPP in
-dnl cygwin32) ;;
-dnl mingw32)  ;;
-dnl *)    echo "Unrecognised win32 platform: $HostPlatform"
-dnl       exit 1
-dnl       ;;
-dnl esac
-dnl EnableWin32DLLs=YES
-dnl ],
-dnl [EnableWin32DLLs=NO]
-dnl )
-dnl AC_SUBST(EnableWin32DLLs)
-dnl if test x"$EnableWin32DLLs" = "xYES" ; then
-dnl  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
-dnl fi
 
 dnl ** Mac OS X: explicit deployment target
 dnl --------------------------------------------------------------