X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=619d414fb947721a02384f759025047bc0ec90c4;hb=fed8458637fecad51631507a5eabcc4af374de24;hp=d8023f67cf265a49380bfe9f1d0a52aa13f77edb;hpb=b67039a74676cd3d8eab39d3e986b889e92338a5;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index d8023f6..619d414 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -258,8 +258,7 @@ dnl do without it for now.
 
 dnl
 dnl Check for Alex and version.  If we're building GHC, then we need
-dnl at least Alex version 2.0.  If there's no installed Alex, we look
-dnl for a alex source tree and point the build system at that instead.
+dnl at least Alex version 2.0.1.
 dnl
 AC_DEFUN([FPTOOLS_ALEX],
 [
@@ -276,8 +275,8 @@ changequote([, ])dnl
 ])
 if test ! -f compiler/cmm/CmmLex.hs || test ! -f 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
+    FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0.1],
+      [AC_MSG_ERROR([Alex version 2.0.1 or later is required to compile GHC.])])[]dnl
 fi
 AlexVersion=$fptools_cv_alex_version;
 AC_SUBST(AlexVersion)
@@ -813,7 +812,7 @@ EOF
 # 'PATH'. Note that /usr/bin/fop is broken in SuSE 9.1 (unpatched), so try
 # /usr/share/fop/fop.sh in that case (or no 'fop'), too.
 AC_DEFUN([FP_PROG_FOP],
-[AC_PATH_PROGS([FopCmd1], [fop])
+[AC_PATH_PROGS([FopCmd1], [fop fop.sh])
 if test -n "$FopCmd1"; then
   AC_CACHE_CHECK([for $FopCmd1 usability], [fp_cv_fop_usability],
     [FP_GEN_FO