From: Simon Marlow <simonmar@microsoft.com>
Date: Wed, 1 Aug 2007 08:32:57 +0000 (+0000)
Subject: fix the hardtop test for ghc-6.2.x, and make it notice failure earlier
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=bb01b8e8a461ea954729c241bac067ffc54ae055

fix the hardtop test for ghc-6.2.x, and make it notice failure earlier
---

diff --git a/aclocal.m4 b/aclocal.m4
index bace42a..7fd96fe 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1104,11 +1104,15 @@ rm -f *.o
 rm -f *.hi
 rm -f pwd
 rm -f pwd.exe
-$WithGhc -v0 --make pwd
+$WithGhc -v0 --make pwd -o pwd
 cd ../..
 
 hardtop=`utils/pwd/pwd forwardslash`
 
+if ! test -d "$hardtop"; then
+  AC_MSG_ERROR([cannot determine current directory])
+fi   
+
 dnl Remove common automounter nonsense
 dnl
 hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|'`
diff --git a/configure.ac b/configure.ac
index e379721..25963ff 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.7], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7.20070731], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}