X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=586d33c098ffdcd88d549bbd5505aebf0bfa37f8;hb=50afb3c579d9eba76f4433881f3a8c67c11fa8bc;hp=1f9cdace5889211a22748ab6f5abe83c358c487c;hpb=aeecdc1180a479d891cfa8e386348c3f57c7905d;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index 1f9cdac..586d33c 100644 --- a/configure.ac +++ b/configure.ac @@ -105,12 +105,21 @@ alpha*-unknown-freebsd*) HostVendor_CPP='unknown' HostOS_CPP='freebsd' ;; -amd64*-unknown-openbsd*) - HostPlatform=amd64-unknown-openbsd - TargetPlatform=amd64-unknown-openbsd - BuildPlatform=amd64-unknown-openbsd - HostPlatform_CPP='amd64_unknown_openbsd' - HostArch_CPP='amd64' +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 + HostPlatform_CPP='x86_64_unknown_openbsd' + HostArch_CPP='x86_64' HostVendor_CPP='unknown' HostOS_CPP='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 @@ -457,11 +520,23 @@ dnl Remove common automounter nonsense dnl hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' ` -dnl Find 'hardtop_plat', the native format for 'hardtop' (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped). +dnl Find 'hardtop_plat', the native format for 'hardtop' +dnl (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped). +dnl +dnl Note OSTYPE: On Cygwin we need to use 'cygpath' to convert /cygdrive/c/foo to c:/foo +dnl but we must not do that if we aren't building using Cygwin (notably msys), +dnl because cygpath doesn't exist. It seems that 'bash' sets OSTYPE to 'cygwin' +dnl or 'msys' respectively, but cygwin's 'sh' does not. So we hackily assume +dnl that if the shell hasn't set it to 'msys' then we must be in Cygwin. Sigh. +dnl +dnl The Right Thing is probably to test $BuildPlatform instead, but we are sloppy +dnl about setting that correctly at the moment, so we just work around for now. dnl +dnl The quotes round "$(OSTYPE)" are essential, for the Cygwin-sh case where OSTYPE +dnl is not set. case $HostPlatform in i386-unknown-mingw32 | i386-unknown-cygwin32) - if test ${OSTYPE} != "msys" + if test "${OSTYPE}" != "msys" then # convert $hardtop to a path that mingw will understand too cyghardtop=${hardtop} @@ -531,7 +606,7 @@ AC_ARG_WITH(gcc, [WhatGccIsCalled="$withval" if test "x$HostPlatform" = "xi386-unknown-mingw32" then - if test ${OSTYPE} != "msys" + if test "${OSTYPE}" != "msys" then # Canonicalise to :/path/to/gcc withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' ` @@ -779,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 @@ -957,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 ? @@ -1418,7 +1469,7 @@ dnl ** check for ld, and whether ld has -x option AC_PATH_PROG(LdCmdRaw, ld) case $HostOS_CPP in mingw32) - if test ${OSTYPE} == "msys" + if test "${OSTYPE}" == "msys" then LdCmd=${LdCmdRaw} else @@ -1433,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