Commit e10230bd authored by simonmar's avatar simonmar
Browse files

[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
parent 6941708c
...@@ -38,17 +38,6 @@ if test x"$srcdir" != 'x.' ; then ...@@ -38,17 +38,6 @@ if test x"$srcdir" != 'x.' ; then
exit 1 exit 1
fi 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--------------------------------------------------------------------
dnl * Choose host(/target/build) platform dnl * Choose host(/target/build) platform
dnl-------------------------------------------------------------------- dnl--------------------------------------------------------------------
...@@ -366,14 +355,26 @@ dnl AC_SUBST(TargetVendor_CPP) ...@@ -366,14 +355,26 @@ dnl AC_SUBST(TargetVendor_CPP)
AC_SUBST(exeext) AC_SUBST(exeext)
# dnl --------------------------------------------------------------
# The native format for 'hardtop' (i.e., right kind of slashes on a Win32 box). dnl * Calculate absolute path to build tree
# (but with b-slashes being escaped). 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 case $HostPlatform in
i386-unknown-mingw32 | i386-unknown-cygwin32) i386-unknown-mingw32 | i386-unknown-cygwin32)
# get rid off /cygdrive/ prefix # convert $hardtop to a path that mingw will understand too
hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' ` cyghardtop=${hardtop}
hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' ` hardtop=`cygpath -m ${cyghardtop}`
hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'`
;; ;;
*) *)
hardtop_plat=${hardtop} hardtop_plat=${hardtop}
...@@ -382,6 +383,8 @@ esac ...@@ -382,6 +383,8 @@ esac
AC_SUBST(hardtop) AC_SUBST(hardtop)
AC_SUBST(hardtop_plat) AC_SUBST(hardtop_plat)
AC_MSG_RESULT(${hardtop})
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
dnl * Project specific configuration options dnl * Project specific configuration options
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment