X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=8f12e0dba07d83c04857c5fa07a231b71d5cc369;hb=a864cb0da9a81a5962560c7a1b13c52b3ec2b684;hp=7d4e52bb929b84ac17310804facb5f31c7e7113b;hpb=525a1e6573af68e02e9fb59846c629edbaecbbb0;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 7d4e52b..8f12e0d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.46 1999/12/21 13:00:54 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.49 2000/06/08 20:57:02 panne Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -319,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*
@@ -387,6 +374,51 @@ undefine([AC_CV_NAME])dnl
 undefine([AC_CV_SIZEOF_NAME])dnl
 ])
 
+dnl ** Map an arithmetic C type to a Haskell type.
+dnl    Based on autconf's AC_CHECK_SIZEOF.
+
+dnl FPTOOLS_CHECK_HTYPE(TYPE)
+AC_DEFUN(FPTOOLS_CHECK_HTYPE,
+[changequote(<<, >>)dnl
+dnl The name to #define.
+define(<<AC_TYPE_NAME>>, translit(htype_$1, [a-z *], [A-Z_P]))dnl
+dnl The cache variable name.
+define(<<AC_CV_NAME>>, translit(fptools_cv_htype_$1, [ *], [_p]))dnl
+changequote([, ])dnl
+AC_MSG_CHECKING(Haskell type for $1)
+AC_CACHE_VAL(AC_CV_NAME,
+[AC_TRY_RUN([#include <stdio.h>
+#include <stddef.h>
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
+typedef $1 testing;
+
+main() {
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  if (((testing)((int)((testing)1.4))) == ((testing)1.4)) {
+    fprintf(f, "%s%d\n",
+           ((testing)(-1) < (testing)0) ? "Int" : "Word",
+           sizeof(testing)*8);
+  } else {
+    fprintf(f,"%s\n",
+           (sizeof(testing) >  sizeof(double)) ? "LDouble" :
+           (sizeof(testing) == sizeof(double)) ? "Double"  : "Float");
+  }
+  fclose(f);
+  exit(0);
+}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=NotReallyAType, AC_CV_NAME=NotReallyAType)])dnl
+AC_MSG_RESULT($AC_CV_NAME)
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME)
+undefine([AC_TYPE_NAME])dnl
+undefine([AC_CV_NAME])dnl
+])
+
 dnl ** figure out whether C compiler supports 'long long's
 dnl    (Closely based on Andreas Zeller's macro for testing
 dnl     for this under C++)
@@ -605,5 +637,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