X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=40c1f2663df98d14ad9da42f523c2f80c7fbe0bc;hb=b72390e9f9984555c9b119af4aa2acea79798870;hp=9ae64495b7ece6f88019a023ff7ee6c4c79e6505;hpb=a977810779813388908daa6dbe57d9d1a05baaa3;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 9ae6449..40c1f26 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.43 1999/07/14 13:26:48 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.47 2000/05/09 10:43:45 rrt Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -134,26 +134,37 @@ esac
 ])
 
 dnl
-dnl Check for Happy and version.
+dnl Check for Happy and version.  If we're building GHC, then we need
+dnl at least Happy version 1.6.  If there's no installed Happy, we look
+dnl for a happy source tree and point the build system at that instead.
+dnl
+dnl ToDo: when we reset HappyCmd to the source tree, autoconf doesn't
+dnl seems to insert it in the cache file.  sigh.
 dnl
 AC_DEFUN(FPTOOLS_HAPPY,
-[AC_PATH_PROG(HappyCmd,happy,,$PATH ${hardtop}/happy/src)
+[AC_PATH_PROG(HappyCmd,happy)
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 [if test x"$HappyCmd" != x; then
    fptools_cv_happy_version="`$HappyCmd -v |
 changequote(, )dnl
 			  grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ;
-changequote([, ])dnl
+elif test -d $srcdir/happy; then
+   HappyCmd=$hardtop/happy/src/happy-inplace;
+   fptools_cv_happy_version=`grep '^ProjectVersion[ 	]*=' $srcdir/happy/mk/version.mk | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`;
+   echo -n "using happy from the source tree... ";
 else
    fptools_cv_happy_version="";
 fi;
-if expr "$fptools_cv_happy_version" "<" 1.4 > /dev/null 2>&1; then
-   echo
-   echo "Happy version 1.4 or later is required to compile GHC."
-   exit 1;
+changequote([, ])dnl
+if expr "$fptools_cv_happy_version" "<" 1.6 > /dev/null 2>&1; then
+   if test -d $srcdir/ghc; then
+     echo
+     echo "Happy version 1.6 or later is required to compile GHC."
+     exit 1;
+   fi
 fi;
 ])
-HappyVersion=$ac_cv_happy_version;
+HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)
 ])
 
@@ -308,26 +319,13 @@ dnl contains path to perl binary
 dnl
 AC_DEFUN(FPTOOLS_CHECK_PERL_VERSION,
 [$PerlCmd -v >conftest.out 2>&1
-if grep "version 4" conftest.out >/dev/null 2>&1; then
-   if grep "Patch level: 35" conftest.out >/dev/null 2>&1; then
-      echo "
-************************************************************************
-Uh-oh...looks like you have Perl 4.035.
-
-Perl version 4.035 has a bug to do with recursion that will bite if
-you run the lit2texi script, when making Info files from
-literate files of various sorts.  Either use perl5, the last version of perl4 
-(4.036), or an older version (e.g., perl 4.019). Failing that, don't create
-any Info files :-)
-************************************************************************
-"
-   fi
+if grep "version 5" conftest.out >/dev/null 2>&1; then
+   :
 else
-   if grep "version 5" conftest.out >/dev/null 2>&1; then
+   if grep "version 6" conftest.out >/dev/null 2>&1; then
       :
    else
-     echo "I'm not sure if your version of perl will work,"
-     echo "but it's worth a shot, eh?"
+     echo "Your version of perl probably won't work."
    fi
 fi
 rm -fr conftest*