micro-opt: replace stmGetEnclosingTRec() with a field access

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41e6c3f..08b8178 100644 (file)
--- 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}
@@ -105,29 +105,6 @@ AC_ARG_ENABLE(hc-boot,
 )
 AC_SUBST(BootingFromHc)
 
-dnl ** Booting from unregisterised .hc files?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(hc-boot-unregisterised,
-[AC_HELP_STRING([--enable-hc-boot-unregisterised],
-[ With --enable-hc-boot, treat the intermediate .hc files as
- unregisterised rather than registerised code.
- (This option is mostly of interest to porters.) [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-        BootingFromUnregisterisedHc=YES
-  else
-        BootingFromUnregisterisedHc=NO
-  fi
-],
-[BootingFromUnregisterisedHc=NO]
-)
-AC_SUBST(BootingFromUnregisterisedHc)
-
-if test "$BootingFromHc" = "NO"; then
-if test "$BootingFromUnregisterisedHc" = "YES"; then
-AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.])
-fi;
-fi;
-
 AC_ARG_ENABLE(bootstrap-with-devel-snapshot,
 [AC_HELP_STRING([--enable-bootstrap-with-devel-snapshot],
                 [Allow bootstrapping using a development snapshot of GHC.  This is not guaranteed to work.])],
@@ -149,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
@@ -278,15 +260,15 @@ i386-apple-darwin|powerpc-apple-darwin)
     soext='.dylib'
     CFLAGS="$CFLAGS -m32"
     LDFLAGS="$LDFLAGS -m32"
-    SRC_CC_OPTS="$SRC_CC_OPTS -m32"
-    SRC_LD_OPTS="$SRC_LD_OPTS -m32"
+    CONF_CC_OPTS="$CONF_CC_OPTS -m32"
+    CONF_LD_OPTS="$CONF_LD_OPTS -m32"
     ;;
 x86_64-apple-darwin)
     soext='.dylib'
     CFLAGS="$CFLAGS -m64"
     LDFLAGS="$LDFLAGS -m64"
-    SRC_CC_OPTS="$SRC_CC_OPTS -m64"
-    SRC_LD_OPTS="$SRC_LD_OPTS -m64"
+    CONF_CC_OPTS="$CONF_CC_OPTS -m64"
+    CONF_LD_OPTS="$CONF_LD_OPTS -m64"
     ;;
 esac
 
@@ -437,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 --------------------------------------------------------------
@@ -542,14 +492,13 @@ dnl     Figure out which C compiler to use.  Gcc is preferred.
 dnl     If gcc, make sure it's at least 2.1
 dnl
 FP_HAVE_GCC
-FP_MINGW_GCC
 FP_GCC_EXTRA_FLAGS
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
 
-AC_SUBST(SRC_CC_OPTS)
-AC_SUBST(SRC_LD_OPTS)
+AC_SUBST(CONF_CC_OPTS)
+AC_SUBST(CONF_LD_OPTS)
 
 dnl ** figure out how to do context diffs
 FP_PROG_CONTEXT_DIFF
@@ -618,9 +567,6 @@ if test "$BootingFromHc" = "NO"; then
 FPTOOLS_ALEX
 fi;
 
-dnl Check we have an acceptable version of windres
-FPTOOLS_WINDRES
-
 dnl --------------------------------------------------
 dnl ### program checking section ends here ###
 dnl --------------------------------------------------
@@ -888,7 +834,7 @@ if grep '   ' compiler/ghc.cabal.in 2>&1 >/dev/null; then
    AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
 fi
 
-AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss distrib/configure-bin.ac])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT