X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=adcb0e7331edbab6d4681a8be2602e460b294dc2;hb=dc816bae3fdf827b87c26faa116456a711f77ed9;hp=d4682eaabc6d044742b258bb40795d45b5b2ea12;hpb=ffe71d18b231aa0223f8ca9229760e6ebced367e;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index d4682ea..adcb0e7 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
@@ -854,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],
@@ -1024,15 +992,9 @@ AC_HEADER_TIME
 dnl dynamic loading include files
 AC_CHECK_HEADERS(dlfcn.h dl.h) 
 
-dnl ** check for farcalloc (in bcc)
-AC_CHECK_HEADER(alloc.h,[AC_CHECK_FUNCS(farcalloc)])
-
-dnl ** check for valloc (in sunos, solaris, mips, amiga, next, minix, ultrix)
-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 ?
@@ -1191,20 +1153,7 @@ if test "$ac_cv_type_signal" = void; then
 fi
 
 dnl ** check for more functions
-AC_CHECK_FUNCS(strcasecmp _stricmp stricmp strcmpi)
-AC_CHECK_FUNCS(strcmp)
-AC_CHECK_FUNCS(realpath _fullpath)  
-AC_CHECK_FUNCS(PBHSetVolSync macsystem)  
-AC_CHECK_FUNCS(fgetpos fsetpos fseek ftell)
-AC_CHECK_FUNCS(vsnprintf _vsnprintf)
-AC_CHECK_FUNCS(snprintf  _snprintf )  
-AC_CHECK_FUNCS(popen     _popen )  
-AC_CHECK_FUNCS(pclose    _pclose )  
-AC_CHECK_FUNCS(setenv unsetenv)
-
-
-dnl ** check for specific library functions that we are interested in
-AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat siginterrupt symlink sysconf timelocal times vadvise localtime_r gmtime_r readdir_r getgrgid_r getgrnam_r getpwuid_r getpwnam_r)
+AC_CHECK_FUNCS([ftime getclock getgrgid_r getgrnam_r getpagesize getpwnam_r getpwuid_r getrusage gettimeofday gmtime_r localtime_r lstat readdir_r readlink setenv setitimer siginterrupt symlink sysconf times unsetenv])
 
 dnl ** Solaris2 needs additionl flag for getpw*_r()
 case "$TargetPlatform" in
@@ -1339,7 +1288,6 @@ else
     	 AC_DEFINE([HAVE_LIBDL], [1], [Define to 1 if you need -ldl to get dlopen().])
     	 LIBS="$LIBS -ldl"], 
     	[HaveLibDL=NO])
-    AC_CHECK_FUNCS(dlopen)
     AC_SUBST(HaveLibDL)
 
     dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set
@@ -1508,6 +1456,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>