leave out ATTRIBUTE_ALIGNED on Windows, it gives a warning

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f4ba4db..9da99da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -796,8 +796,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
-  FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.4],
-    [AC_MSG_ERROR([GHC version 6.4 or later is required to compile GHC.])])dnl
+  FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.6],
+    [AC_MSG_ERROR([GHC version 6.6 or later is required to compile GHC.])])dnl
 fi;
 
 # This uses GHC, so put it after the "GHC is required" check above:
@@ -1003,15 +1003,15 @@ if test "$BootingFromHc" = "NO"; then
 FPTOOLS_HAPPY
 fi;
 
-dnl ** check for installed haddock
-FPTOOLS_HADDOCK
-
 dnl ** check for installed alex binary + version
 dnl    (don't do it if we're booting from .hc files though.)
 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 --------------------------------------------------