Merge from trunk.

diff --cc configure.ac
index 224be5e7353a4023c20392ea6d98be23c50357c4,7dda0010f28c896d1c46f0dfbbc23b74fea2d7d0..3094a10a5fc8610d6c825c0c3fe7362c36b1f598
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1283,9 -1287,9 +1283,9 @@@ f
  dnl checks for header files
  AC_CHECK_HEADERS_ONCE(
    linux/version.h sys/systeminfo.h
 -  coff.h pty.h
 +  fcntl.h coff.h pty.h
    sys/vlimit.h sys/resource.h
-   sys/utsname.h pwd.h utmp.h dirent.h util.h)
+   sys/utsname.h pwd.h utmp.h util.h)
  
  AC_MSG_CHECKING(if personality LINUX32 can be set)
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
@@@ -2899,10 -2891,10 +2899,10 @@@ AC_SUBST(BLESSMAIL_TARGET
  
  
  AC_CHECK_FUNCS(gethostname \
- closedir getrusage get_current_dir_name \
+ getrusage get_current_dir_name \
  lrand48 \
 -select getpagesize setlocale \
 -utimes getrlimit setrlimit shutdown getaddrinfo \
 +fpathconf select getpagesize setlocale \
 +utimes getrlimit setrlimit getcwd shutdown getaddrinfo \
  strsignal setitimer \
  sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
  gai_strerror mkstemp getline getdelim fsync sync \