X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=586d33c098ffdcd88d549bbd5505aebf0bfa37f8;hb=50afb3c579d9eba76f4433881f3a8c67c11fa8bc;hp=a83db0fdcb4714b23d4096264ff6af78c35b3a38;hpb=c7b6fe940417b8ff6200c85690c6ee2c613767c8;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index a83db0f..586d33c 100644
--- 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
@@ -613,12 +613,7 @@ AC_ARG_WITH(gcc,
        fi
  fi;
  CC="$withval"],
-[if test "x$HostPlatform" = "xi386-unknown-mingw32"
-    then
-    WhatGccIsCalled=`which gcc`
-    else
-    WhatGccIsCalled="gcc"
- fi;]
+[WhatGccIsCalled="gcc"]
 )
 AC_SUBST(WhatGccIsCalled)
 
@@ -859,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
@@ -1037,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 ?
@@ -1513,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>