X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=9c1bc925bea67fe59149f3e9e38457b78728a8ee;hb=d3c7831f1ba9c6070e390f53daa24ed7da05139e;hp=ea73a21444ed9b6f0954683c638738c044b718ff;hpb=31667d5ee9808bc7e400de70397df317b6c1020c;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index ea73a21..9c1bc92 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -269,15 +269,15 @@ AS_IF([test "$fp_num1" $2 "$fp_num2"], [$4], [$5])[]dnl dnl -dnl Check for Greencard and version. +dnl Check for GreenCard and version. dnl AC_DEFUN(FPTOOLS_GREENCARD, [ -AC_PATH_PROG(GreencardCmd,greencard) +AC_PATH_PROG(GreenCardCmd,greencard) AC_CACHE_CHECK([for version of greencard], fptools_cv_greencard_version, changequote(, )dnl -[if test x"$GreencardCmd" != x; then - fptools_cv_greencard_version="`$GreencardCmd --version | +[if test x"$GreenCardCmd" != x; then + fptools_cv_greencard_version="`$GreenCardCmd --version | grep 'version' | sed -e 's/greencard. version \([^ ]*\).*/\1/g'`" else fptools_cv_greencard_version="" @@ -286,8 +286,8 @@ changequote([, ])dnl ]) FP_COMPARE_VERSIONS([$fptools_cv_greencard_version],[-lt],[$1], [AC_MSG_ERROR([greencard version $1 or later is required (found '$fptools_cv_greencard_version')])])[]dnl -GreencardVersion=$fptools_cv_greencard_version -AC_SUBST(GreencardVersion) +GreenCardVersion=$fptools_cv_greencard_version +AC_SUBST(GreenCardVersion) ]) dnl @@ -372,10 +372,10 @@ else fi; changequote([, ])dnl ]) -dnl if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Lexer.hs; then -dnl FP_COMPARE_VERSIONS([$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 +if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Lexer.hs; then + FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0], + [AC_MSG_ERROR([Alex version 2.0 or later is required to compile GHC.])])[]dnl +fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) ])