[project @ 2004-03-11 10:00:23 by simonmar]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 113889a..7e201fa 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -307,7 +307,7 @@ else
 fi
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 changequote(, )dnl
-[if test x"$HappyCmd" = x"$SrcTreeHappyCmd"; then
+[if test x"$HappyCmd" = x"$SrcTreeHappyCmd" -a -e $srcdir/happy/mk/version.mk; then
    fptools_cv_happy_version=`grep '^ProjectVersion[    ]*=' $srcdir/happy/mk/version.mk | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`;
 elif test x"$HappyCmd" != x; then
    fptools_cv_happy_version="`$HappyCmd -v |
@@ -448,7 +448,12 @@ fi
 rm -rf conftest*
 case $HostPlatform in
  *mingw32) 
-         ArCmd="`cygpath -w ${ArCmdRaw} | sed -e 's@\\\\@/@g' ` ${ArCmdArgs}"
+         if test ${OSTYPE} == "msys"
+          then
+            ArCmd="${ArCmdRaw} ${ArCmdArgs}"
+          else
+            ArCmd="`cygpath -w ${ArCmdRaw} | sed -e 's@\\\\@/@g' ` ${ArCmdArgs}"
+         fi
          ;;
  *) ArCmd="${ArCmdRaw} ${ArCmdArgs}"
     ;;