From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Nov 2012 09:52:06 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~82
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1235f93957aaf92f6248d6f8e1a1cc47c5ad3c66;p=emacs.git

Merge from trunk.
---

1235f93957aaf92f6248d6f8e1a1cc47c5ad3c66
diff --cc configure.ac
index 224be5e7353,7dda0010f28..3094a10a5fc
--- a/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 \