X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=3a79ef8642839233185d691b98d7e6e31077360c;hb=b69adc4f84c0b56dd47edcdd1274061eac2aca45;hp=b0fbe082be5710964af3597a2393cdb1c9b40548;hpb=50d49d9165e16c2e156ea3954cf89775fe8a9644;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index b0fbe08..3a79ef8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.96 2002/02/17 13:56:35 panne Exp $ +dnl $Id: aclocal.m4,v 1.99 2002/04/10 09:41:16 simonmar Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -214,7 +214,7 @@ else fi; changequote([, ])dnl ]) -if test -d $srcdir/ghc; then +if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-lt,[1.9], [AC_MSG_ERROR([Happy version 1.9 or later is required to compile GHC.])])dnl fi @@ -407,7 +407,6 @@ AC_DEFUN(FPTOOLS_HAVE_GCC, else changequote(, )dnl is_gcc_v1="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/expr 2000 \\\>= \1 \\\* 1000 + \2/g' `" - is_gcc_v3="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/expr 3000 \\\<= \1 \\\* 1000 + \2/g' `" changequote([, ])dnl fptools_cv_have_gcc='yes' if test `eval $is_gcc_v1 2>/dev/null` = "1"; then @@ -419,15 +418,6 @@ changequote([, ])dnl echo "we recommend 2.95.3, although versions back to 2.7.2 should be ok." AC_MSG_ERROR([gcc 1.X has never been supported]) fi - if test `eval $is_gcc_v3 2>/dev/null` = "1"; then - fptools_cv_have_gcc='no' - echo "" - echo "your gcc version appears to be ..." - $CC --version - echo "gcc versions 3.0 and above are not yet supported." - echo "we recommend 2.95.3, although versions back to 2.7.2 should be ok." - AC_MSG_ERROR([gcc 3.0 and above is not currently supported]) - fi fi ]) HaveGcc=`echo $fptools_cv_have_gcc | sed 'y/yesno/YESNO/'` @@ -501,7 +491,7 @@ dnl [original version pinched from c2hs] dnl AC_DEFUN(FPTOOLS_GHC_VERSION, [FPTOOLS_NOCACHE_CHECK([version of ghc], [fptools_version_of_ghc], -[${WithGhc-ghc} --version > conftestghc 2>&1 +["${WithGhc-ghc}" --version > conftestghc 2>&1 cat conftestghc >&AC_FD_CC #Useless Use Of cat award... fptools_version_of_ghc=`cat conftestghc | sed -n -e 's/, patchlevel *\([[0-9]]\)/.\1/;s/.* version \([[0-9]][[0-9.]]*\).*/\1/p'`