X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=8c984def52bec2ac8cf9afed4c6c242aeeb8decf;hb=e8043f339e23328e3457696589edaa1ab7d60a64;hp=31281c03fd0a1941b897eb03b1e9eb1e033f2ffe;hpb=4f51ac1246f9a9b2bd172e2d6957d95942d12d23;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 31281c0..8c984de 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.20081214], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.11], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
@@ -1280,3 +1280,22 @@ AC_SUBST(HavePapi)
 AC_CONFIG_FILES([mk/config.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
+
+# We get caught by
+#     http://savannah.gnu.org/bugs/index.php?1516
+#     $(eval ...) inside conditionals causes errors
+# with make 3.80, so warn the user if it looks like they're about to
+# try to use it.
+checkMake380() {
+    if $1 --version 2>&1 | head -1 | grep -q 'GNU Make 3\.80'
+    then
+        echo
+        echo "WARNING: It looks like \"$1\" is GNU make 3.80."
+        echo "This version cannot be used to build GHC."
+        echo "Please use GNU make >= 3.81."
+    fi
+}
+
+checkMake380 make
+checkMake380 gmake
+