X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=eca417a455550d0fb53c95a8fa2272211fffc11d;hb=4c0095c2714063d0b6e31562fd5c0bbe015af980;hp=5755dbe6e7ee454475de7bcde7dc97d276a19462;hpb=5c789e424c1461c1dadfd38c44fcb9e8f38bf755;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 5755dbe..eca417a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -611,6 +611,11 @@ echo foo > conftest.txt
 $fp_prog_find conftest.txt -print > conftest.out 2>&1
 if grep '^conftest.txt$' conftest.out > /dev/null 2>&1 ; then
   # OK, looks like a real "find".
+  if which cygpath 1> /dev/null 2> /dev/null
+  then
+    fp_prog_find=`cygpath --mixed "$fp_prog_find"`
+    AC_MSG_NOTICE([Converted to "$fp_prog_find"])
+  fi
   FindCmd="$fp_prog_find"
 else
   # Found a poor WinDoze version of "find", ignore it.
@@ -978,7 +983,10 @@ AC_DEFUN([FP_SETUP_PROJECT_VERSION],
 [
 if test "$RELEASE" = "NO"; then
     AC_MSG_CHECKING([for GHC version date])
-    if test -d _darcs; then
+    if test -f VERSION_DATE; then
+        PACKAGE_VERSION=${PACKAGE_VERSION}.`cat VERSION_DATE`
+        AC_MSG_RESULT(given $PACKAGE_VERSION)
+    elif test -d _darcs; then
         changequote(, )dnl
         ver_date=`darcs changes --quiet --no-summary --xml | head -500 | grep 'date=' | sed "s/^.*date='\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*$/\1/g" | sort -n | tail -1`
         if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else
@@ -986,10 +994,10 @@ if test "$RELEASE" = "NO"; then
                 AC_MSG_ERROR([failed to detect version date: check that darcs is in your path])
         fi
         PACKAGE_VERSION=${PACKAGE_VERSION}.$ver_date
-        AC_MSG_RESULT($PACKAGE_VERSION)
+        AC_MSG_RESULT(inferred $PACKAGE_VERSION)
     elif test -f VERSION; then
         PACKAGE_VERSION=`cat VERSION`
-        AC_MSG_RESULT($PACKAGE_VERSION)
+        AC_MSG_RESULT(given $PACKAGE_VERSION)
     else
         AC_MSG_WARN([cannot determine snapshot version: no _darcs directory and no VERSION file])
     fi