[project @ 2004-08-28 15:50:44 by panne]

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 782b9b9..586d33c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ alpha*-unknown-openbsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
         ;;
-amd64*-*-openbsd*)
+amd64-*-openbsd*|x86_64-*-openbsd*)
        HostPlatform=x86_64-unknown-openbsd
        TargetPlatform=x86_64-unknown-openbsd
        BuildPlatform=x86_64-unknown-openbsd
@@ -326,6 +326,15 @@ m68k-sun-sunos4*)
         HostVendor_CPP='sun'
         HostOS_CPP='sunos4'
         ;;
+m88k-*-openbsd*)
+       HostPlatform=m88k-unknown-openbsd
+       TargetPlatform=m88k-unknown-openbsd
+       BuildPlatform=m88k-unknown-openbsd
+        HostPlatform_CPP='m88k_unknown_openbsd'
+        HostArch_CPP='m88k'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 mips-*-linux*)
         HostPlatform=mips-unknown-linux # hack again
         TargetPlatform=mips-unknown-linux
@@ -440,6 +449,24 @@ sparc-*-openbsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
         ;;
+sparc64-*-openbsd*)
+        HostPlatform=sparc64-unknown-openbsd
+        TargetPlatform=sparc64-unknown-openbsd
+        BuildPlatform=sparc64-unknown-openbsd
+        HostPlatform_CPP='sparc64_unknown_openbsd'
+        HostArch_CPP='sparc64'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
+vax-*-openbsd*)
+        HostPlatform=vax-unknown-openbsd
+        TargetPlatform=vax-unknown-openbsd
+        BuildPlatform=vax-unknown-openbsd
+        HostPlatform_CPP='vax_unknown_openbsd'
+        HostArch_CPP='vax'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 *)
         echo "Unrecognised platform: $HostPlatform"
         exit 1
@@ -827,34 +854,10 @@ dnl ** check for tar
 dnl   if GNU tar is named gtar, look for it first.
 AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
-dnl ** check for jade/openjade & determine a working catalog
-AC_PATH_PROGS(JadeCmd,openjade jade,jade)
-FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 
-                        /etc/sgml/catalog /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl /usr/local/share/sgml/catalog glafp-utils/docbook/CATALOG*)
-if test -z "$Catalog"; then
-  AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
-fi
-case $Catalog in
-   yes) # assume it is provided by other means (e.g., SGML_CATALOG_FILES env var).
-        Catalog=
-       ;;
-   glafp*) 
-       case $HostOS_CPP in
-          mingw32)
-                 if test "${OSTYPE}" == "msys"
-                   then
-                     Catalog=$hardtop/$Catalog
-                   else
-                     Catalog=`cygpath -w $hardtop/$Catalog`
-                 fi
-             ;;
-          *) Catalog=$hardtop/$Catalog
-             ;;
-       esac
-   ;;
-esac   
-AC_SUBST(Catalog)
-
+dnl ** check for DocBook toolchain
+FP_CHECK_DOCBOOK_DTD
+FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl])
+FP_PROG_FO_PROCESSOR
 
 dnl ** check for ghc-pkg command
 changequote(, )dnl
@@ -1005,7 +1008,7 @@ AC_CHECK_HEADER(malloc.h,[AC_CHECK_FUNCS(valloc)])
 
 dnl ** check for POSIX regex
 HavePosixRegex=NO
-AC_CHECK_HEADERS(regex.h,[AC_CHECK_FUNC(regcomp, [HavePosixRegex=YES])])
+AC_CHECK_HEADERS(regex.h,[AC_CHECK_FUNCS(regcomp, [HavePosixRegex=YES])])
 AC_SUBST(HavePosixRegex)
 
 dnl ** how do we get a timezone name, and UTC offset ?
@@ -1481,6 +1484,10 @@ FPTOOLS_LD_X
 
 FP_EMPTY_STRUCTS
 
+dnl ** Check for idiosyncracies in some mingw impls of directory handling.
+FP_READDIR_EOF_ERRNO
+FP_DIRENT_FLAT_LAYOUT
+
 AC_MSG_CHECKING([for SIGPOLL])
 AC_EGREP_CPP(we_have_sigpoll,
 [#include <signal.h>