X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=12ebf1edfe9e63bbc83bb53baa4379149ba0ea71;hb=25a96d106f30518aadfbcb0da4f44e849778773e;hp=b505440057d2850aa84c4d349031e136a1151bf7;hpb=e10230bd4571a81272d8e49b0997daa62cfb12e4;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index b505440..12ebf1e 100644
--- a/configure.in
+++ b/configure.in
@@ -373,7 +373,7 @@ case $HostPlatform in
   i386-unknown-mingw32 | i386-unknown-cygwin32)
   	# convert $hardtop to a path that mingw will understand too
 	cyghardtop=${hardtop}
-	hardtop=`cygpath -m ${cyghardtop}`
+	hardtop=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@/@g'`
   	hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'`
 	;;
   *)
@@ -692,7 +692,15 @@ AC_SUBST(CompressCmd)
 AC_SUBST(CompressSuffix)
 
 dnl ** check for ghc-pkg command
-AC_PATH_PROG(GhcPkgCmd,ghc-pkg)
+changequote(, )dnl
+ghc_pkg_guess=`echo $WithGhc | sed 's@ghc\([^/\\]*\)$@ghc-pkg\1@'`
+changequote([, ])dnl
+if $ghc_pkg_guess -l >/dev/null 2>/dev/null; then
+   GhcPkgCmd=$ghc_pkg_guess
+   AC_MSG_NOTICE([using $ghc_pkg_guess for ghc-pkg])
+else
+   AC_PATH_PROG(GhcPkgCmd,ghc-pkg)
+fi
 
 AC_ARG_WITH(greencard,
 [  --with-greencard=<greencard compiler>