X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=de601b7d140959db9e64aad71a3da1914d82f757;hb=7363193debb128e302c194c863eb71073e69da0d;hp=f9609241baa3ca849c0653fc6a275b56291c19d9;hpb=fccc859dcc50931f9477b782d5a48e514b426afd;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index f960924..de601b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,16 @@ alpha*-unknown-freebsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='freebsd'
         ;;
-amd64*-*-openbsd*)
+alpha*-unknown-openbsd*)
+	HostPlatform=alpha-unknown-openbsd
+	TargetPlatform=alpha-unknown-openbsd
+	BuildPlatform=alpha-unknown-openbsd
+        HostPlatform_CPP='alpha_unknown_openbsd'
+        HostArch_CPP='alpha'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
+amd64-*-openbsd*|x86_64-*-openbsd*)
 	HostPlatform=x86_64-unknown-openbsd
 	TargetPlatform=x86_64-unknown-openbsd
 	BuildPlatform=x86_64-unknown-openbsd
@@ -123,6 +132,15 @@ arm*-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
+arm*-openbsd*)
+        HostPlatform=arm-unknown-openbsd
+        TargetPlatform=arm-unknown-openbsd
+        BuildPlatform=arm-unknown-openbsd
+        HostPlatform_CPP='arm_unknown_openbsd'                 
+        HostArch_CPP='arm'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 hppa*-*-linux*)
         HostPlatform=hppa-unknown-linux # hack again
         TargetPlatform=hppa-unknown-linux
@@ -132,6 +150,15 @@ hppa*-*-linux*)
         HostVendor_CPP='unknown'                             
         HostOS_CPP='linux'
         ;;
+hppa*-*-openbsd*)
+        HostPlatform=hppa-unknown-openbsd # hack again
+        TargetPlatform=hppa-unknown-openbsd
+        BuildPlatform=hppa-unknown-openbsd
+        HostPlatform_CPP='hppa_unknown_openbsd'                
+        HostArch_CPP='hppa'
+        HostVendor_CPP='unknown'                             
+        HostOS_CPP='openbsd'
+        ;;
 hppa1.1-hp-hpux*)
 	HostPlatform=hppa1.1-hp-hpux  # canonicalise for our purposes (hack)
 	TargetPlatform=hppa1.1-hp-hpux
@@ -299,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
@@ -359,6 +395,15 @@ powerpc-unknown-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
+powerpc-unknown-openbsd*)
+        HostPlatform=powerpc-unknown-openbsd
+        TargetPlatform=powerpc-unknown-openbsd
+        BuildPlatform=powerpc-unknown-openbsd
+        HostPlatform_CPP='powerpc_unknown_openbsd'
+        HostArch_CPP='powerpc'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 s390-ibm-linux*)
        HostPlatform=s390-ibm-linux
        TargetPlatform=s390-ibm-linux #hack
@@ -404,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
@@ -791,45 +854,13 @@ 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
-ghc_pkg_guess=`echo $WithGhc | sed 's@ghc\([^/\\]*\)$@ghc-pkg\1@'`
-changequote([, ])dnl
-if $ghc_pkg_guess -l >/dev/null 2>/dev/null; then
-   GhcPkgCmd=$ghc_pkg_guess
-   AC_MSG_NOTICE([using $ghc_pkg_guess for ghc-pkg])
-else
-   AC_PATH_PROG(GhcPkgCmd,ghc-pkg)
-fi
+FP_PROG_GHC_PKG
 
 AC_ARG_WITH(greencard,
 [AC_HELP_STRING([--with-greencard=ARG],
@@ -969,7 +1000,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 ?
@@ -1445,6 +1476,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>