projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a primop for getting the fields of the AP_STACK rather than an FFI call
[ghc-hetmet.git]
/
aclocal.m4
diff --git
a/aclocal.m4
b/aclocal.m4
index
5755dbe
..
1e79fd9
100644
(file)
--- 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 "$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
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_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`
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
else
AC_MSG_WARN([cannot determine snapshot version: no _darcs directory and no VERSION file])
fi