X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=37a731e30c6dd8de6c7b927a530225048c5eaaa9;hb=247e8ad162edd7fb57396193aacfc5d7c56a2727;hp=66698d1df0814a8837a7a2687d806a247d01f3a9;hpb=e2314d3d270b26dee37467290a01c84e6da26e16;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index 66698d1..37a731e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.122 2003/08/13 12:34:04 simonmar Exp $ +dnl $Id: aclocal.m4,v 1.124 2003/08/14 15:43:22 simonmar Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -285,16 +285,16 @@ changequote(, )dnl fptools_cv_alex_version=`grep '^ProjectVersion[ ]*=' $srcdir/alex/mk/version.mk | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; elif test x"$AlexCmd" != x; then fptools_cv_alex_version="`$AlexCmd -v | - grep 'Alex Version' | sed -e 's/Alex Version \([^ ]*\).*/\1/g'`" ; + grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'`" ; else fptools_cv_alex_version=""; fi; changequote([, ])dnl ]) -if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Lexer.hs; then - FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_alex_version],-lt,[2.0], - [AC_MSG_ERROR([Alex version 2.0 or later is required to compile GHC.])])dnl -fi +dnl if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Lexer.hs; then +dnl FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_alex_version],-lt,[2.0], +dnl [AC_MSG_ERROR([Alex version 2.0 or later is required to compile GHC.])])dnl +dnl fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) ])