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

diff --git a/aclocal.m4 b/aclocal.m4
index 5755dbe..1e79fd9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -978,7 +978,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 +989,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