diff options
| author | sof <unknown> | 2005-03-24 00:38:57 +0000 |
|---|---|---|
| committer | sof <unknown> | 2005-03-24 00:38:57 +0000 |
| commit | 55bc3c39930c71f5d5221634782676310a7c25e4 (patch) | |
| tree | 62da75e75779b0c593eb98b2f40339ccc26d9a3d /aclocal.m4 | |
| parent | 15552e1454cef69c118777720531213256e91079 (diff) | |
| download | haskell-55bc3c39930c71f5d5221634782676310a7c25e4.tar.gz | |
[project @ 2005-03-24 00:38:57 by sof]
FPTOOLS_HAPPY, FPTOOLS_ALEX: cope with version.mk:ProjectVersion 'x.y.z' formats (ignoring the 'z' patchlevel). Merge to STABLE (I suppose)
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 8f087d125e..0e9f4579dc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -263,7 +263,7 @@ fi AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, changequote(, )dnl [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'`; + fptools_cv_happy_version=`grep '^ProjectVersion[ ]*=' $srcdir/happy/mk/version.mk | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; elif test x"$HappyCmd" != x; then fptools_cv_happy_version="`$HappyCmd -v | grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ; @@ -330,7 +330,7 @@ fi AC_CACHE_CHECK([for version of alex], fptools_cv_alex_version, changequote(, )dnl [if test x"$AlexCmd" = x"$SrcTreeAlexCmd"; then - fptools_cv_alex_version=`grep '^ProjectVersion[ ]*=' $srcdir/alex/mk/version.mk | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; + fptools_cv_alex_version=`grep '^ProjectVersion[ ]*=' $srcdir/alex/mk/version.mk | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; elif test x"$AlexCmd" != x; then fptools_cv_alex_version="`$AlexCmd -v | grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'`" ; |