diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-22 22:45:04 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-22 22:45:04 +0100 |
| commit | e75227feacf1434a342c8a7e6ec3619dc6771c39 (patch) | |
| tree | 2fc44a0694639e0ab991378803dff0a9983f0f7f /aclocal.m4 | |
| parent | 35ccb1819d3a3fa100ed4e77798da7a58654a08d (diff) | |
| download | haskell-e75227feacf1434a342c8a7e6ec3619dc6771c39.tar.gz | |
Remove HaveGcc (it was always YES)
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 51aef938e9..4b6e85529d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -694,32 +694,24 @@ rm -f conftest # FP_HAVE_GCC # ----------- # Extra testing of the result AC_PROG_CC, testing the gcc version no. Sets the -# output variables HaveGcc and GccVersion. +# output variable GccVersion. AC_DEFUN([FP_HAVE_GCC], [AC_REQUIRE([AC_PROG_CC]) -if test -z "$GCC"; then - fp_have_gcc=NO -else - fp_have_gcc=YES -fi -if test "$fp_have_gcc" = "NO"; then +if test -z "$GCC" +then AC_MSG_ERROR([gcc is required]) fi GccLT34= AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version], -[if test "$fp_have_gcc" = "YES"; then - fp_cv_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`" - FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.0], - [AC_MSG_ERROR([Need at least gcc version 3.0 (3.4+ recommended)])]) - # See #2770: gcc 2.95 doesn't work any more, apparently. There probably - # isn't a very good reason for that, but for now just make configure - # fail. - FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.4], GccLT34=YES) - else - fp_cv_gcc_version="not-installed" - fi +[ + fp_cv_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`" + FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.0], + [AC_MSG_ERROR([Need at least gcc version 3.0 (3.4+ recommended)])]) + # See #2770: gcc 2.95 doesn't work any more, apparently. There probably + # isn't a very good reason for that, but for now just make configure + # fail. + FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.4], GccLT34=YES) ]) -AC_SUBST([HaveGcc], [$fp_have_gcc]) AC_SUBST([GccVersion], [$fp_cv_gcc_version]) AC_SUBST(GccLT34) ])# FP_HAVE_GCC |