From: simonmar <unknown>
Date: Thu, 21 Jul 2005 09:27:34 +0000 (+0000)
Subject: [project @ 2005-07-21 09:27:34 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~342
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=6a83f07f0b8e337e472c69c0408cecf93782e265

[project @ 2005-07-21 09:27:34 by simonmar]
Require Perl >= 5.6
---

diff --git a/aclocal.m4 b/aclocal.m4
index 900ef7f..8ce485b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -597,9 +597,6 @@ dnl contains path to perl binary
 dnl
 AC_DEFUN(FPTOOLS_CHECK_PERL_VERSION,
 [$PerlCmd -v >conftest.out 2>&1
-if grep "version 5" conftest.out >/dev/null 2>&1; then
-   :
-else
    if grep "v5.6" conftest.out >/dev/null 2>&1; then
       :
    else
@@ -609,11 +606,10 @@ else
          if grep "version 6" conftest.out >/dev/null 2>&1; then
             :
          else
-            echo "Your version of perl probably won't work."
-         fi  
+            AC_MSG_ERROR([your version of perl probably won't work, try upgrading it.])
+         fi
       fi
    fi
-fi
 rm -fr conftest*
 ])