From: simonmar <unknown>
Date: Tue, 10 Jun 2003 11:57:02 +0000 (+0000)
Subject: [project @ 2003-06-10 11:57:02 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~788
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=e10230bd4571a81272d8e49b0997daa62cfb12e4

[project @ 2003-06-10 11:57:02 by simonmar]
Tidy up the $hardtop test:

  - use cygpath -m to calculate $hardtop on Windows, rather than
    our own partial solution.  Fixes building under c:/cygwin
    on Windows.

  - remove some old stuff dealing with paths we used to use at
    Glasgow.

  - use proper AC_MSG macros instead of explicit echo.

MERGE TO STABLE
---

diff --git a/configure.in b/configure.in
index b020a3a..b505440 100644
--- a/configure.in
+++ b/configure.in
@@ -38,17 +38,6 @@ if test x"$srcdir" != 'x.' ; then
     exit 1
 fi
 
-#
-# Remove common automounter nonsense + convert from UNC to DOS style paths
-# (UNC awareness isn't quite there yet for cygwin32-beta18 and consituent tools.)
-#
-hardtop=`pwd`
-hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^/grasp_tmp|/local/grasp_tmp|' | sed 's|^//\(.\)/|\1:/|' `
-
-echo ''
-echo "*** The top of your build tree is: $hardtop"
-# subst of hardtop is done below after we've computed hardtop_plat.
-
 dnl--------------------------------------------------------------------
 dnl * Choose host(/target/build) platform
 dnl--------------------------------------------------------------------
@@ -366,14 +355,26 @@ dnl AC_SUBST(TargetVendor_CPP)
 
 AC_SUBST(exeext)
 
-#
-# The native format for 'hardtop' (i.e., right kind of slashes on a Win32 box).
-# (but with b-slashes being escaped).
+dnl --------------------------------------------------------------
+dnl * Calculate absolute path to build tree
+dnl --------------------------------------------------------------
+
+AC_MSG_CHECKING(for path to top of build tree)
+
+hardtop=`pwd`
+
+dnl Remove common automounter nonsense
+dnl
+hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' `
+
+dnl Find 'hardtop_plat', the native format for 'hardtop' (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped).
+dnl
 case $HostPlatform in
   i386-unknown-mingw32 | i386-unknown-cygwin32)
-  	# get rid off /cygdrive/ prefix
-	hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' `
-  	hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' `
+  	# convert $hardtop to a path that mingw will understand too
+	cyghardtop=${hardtop}
+	hardtop=`cygpath -m ${cyghardtop}`
+  	hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'`
 	;;
   *)
   	hardtop_plat=${hardtop}
@@ -382,6 +383,8 @@ esac
 AC_SUBST(hardtop)
 AC_SUBST(hardtop_plat)
 
+AC_MSG_RESULT(${hardtop})
+
 dnl --------------------------------------------------------------
 dnl * Project specific configuration options
 dnl --------------------------------------------------------------