X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=6eb2d1cda253880bf84b7d19e904499546abf661;hb=d7fefe23ad15148686c0f2a1351d5e4dfc7e859c;hp=85523c67b44a6142dd00fd39111cdb1b694cdf66;hpb=26bced60abe26e8fa6a529dd17788ecaef226a21;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 85523c6..6eb2d1c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.45 1999/11/04 15:09:09 sewardj Exp $
+dnl $Id: aclocal.m4,v 1.48 2000/05/31 00:55:10 chak Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -134,28 +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;
+changequote([, ])dnl
 if expr "$fptools_cv_happy_version" "<" 1.6 > /dev/null 2>&1; then
-   if test -d ghc; 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)
 ])
 
@@ -310,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*
@@ -596,5 +592,48 @@ AC_DEFINE(HAVE_PROTOTYPES)
 fi
 ])
 
+dnl ** Check which CATALOG file we have to use with DocBook SGML.
+dnl
+dnl FPTOOLS_DOCBOOK_CATALOG(VARIABLE, JADE, STYLESHEET, CATALOGS-TO-CHECK-FOR)
+dnl
+dnl If any of the catalogs given in CATALOGS-TO-CHECK-FOR works on this
+dnl platform, let VARIABLE refer to this catalog; otherwise, VARIABLE
+dnl is set to "no".  JADE is the jade executable and STYLESHEET
+dnl a DocBook style sheet.
+dnl
+AC_DEFUN(FPTOOLS_DOCBOOK_CATALOG,
+[AC_CACHE_CHECK([for DocBook CATALOG], fptools_cv_sgml_catalog,
+[
+cat > conftest.sgml << EOF
+<!DOCTYPE Article PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<Article>
+<ArtHeader>
+<Title>Test</Title>
+<Author><OtherName>Test</OtherName></Author>
+<Address>Test</Address>
+<PubDate>Test</PubDate>
+</ArtHeader>
+<Sect1><Title>Test</Title>
+<Para>
+Test.
+</Para>
+</Sect1>
+</Article>
+EOF
+fptools_cv_sgml_catalog=no
+for fptools_catalog in $4; do
+  ac_try="$2 -t rtf -d $3#print -c $fptools_catalog conftest.sgml"
+  if AC_TRY_EVAL(ac_try); then
+    fptools_cv_sgml_catalog=[$]fptools_catalog
+    break
+  fi
+done
+])
+rm -rf conftest*
+if test $fptools_cv_sgml_catalog != "no"; then
+  $1=$fptools_cv_sgml_catalog
+fi
+])
+
 
 # LocalWords:  fi