X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=9a731ec66977259f523e0fb622c305fd325c3146;hb=43b3348045eb2dd541949353ce0a1ea299ba7884;hp=f7841b84dd2906995d706a485e430ea8647f43a3;hpb=53386c359c55bd6eaa13c35fe174c9274ff5888e;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index f7841b8..9a731ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -856,48 +856,11 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
 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* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl])
+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 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 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],
@@ -1196,16 +1159,11 @@ 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)
+AC_CHECK_FUNCS([setenv unsetenv])
+dnl Note: The following test would make sense but the respective code
+dnl doesn't use HAVE_BLAH #ifdefs yet.
+dnl AC_CHECK_FUNCS([strcasecmp _stricmp], [break])
+dnl AC_CHECK_FUNCS([snprintf _snprintf], [break])  
 
 
 dnl ** check for specific library functions that we are interested in
@@ -1513,6 +1471,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>