; Merge from origin/emacs-25

[gnu-emacs] / nt / mingw-cfg.site

diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site
index 96cda2d624aea61ef897f53e87296d11fc42a67b..f3c8f81e28752a4e102d3411b3c805e85811c5c3 100644 (file)
--- a/nt/mingw-cfg.site
+++ b/nt/mingw-cfg.site
@@ -1,4 +1,4 @@
-#! /bin/sh
+# -*- sh -*-
 # Site defaults for the MinGW configuration of GNU Emacs.
 #
 # This file's purpose is to short-circuit configure-time tests for
@@ -12,10 +12,11 @@
 # value of a shell variable ac_cv_header_foo_h.  The value should be
 # yes if the header is deemed to exist, no otherwise.  Or it could be
 # something else, if the value computed by 'configure' requires that.
-# In general, since nt/msysconfig.sh instructs GCC to use header files
-# in nt/inc, you should not need to futz with header file tests.  But
-# there are exceptions, like with getopt.h below (which is a MinGW
-# system header, but we do not want to use it).
+# In general, since configure (when invoked from an MSYS environment)
+# instructs GCC to use header files in nt/inc, you should not need to
+# futz with header file tests.  But there are exceptions, like with
+# getopt.h below (which is a MinGW system header, but we do not want
+# to use it).
 #
 # For each library function foo you want to supply test results, set
 # the value of a shell variable ac_cv_func_foo.  Again, the value is
@@ -26,11 +27,25 @@
 #
 # In short, examine the test in 'configure' and push the knobs that
 # are necessary to steer the test in the direction you need, by
-# judicioulsy setting variables that control the test results.
+# judiciously setting variables that control the test results.
 
 # We want to use getopt.h from gnulib
 ac_cv_header_getopt_h=no
 
+# We don't want our struct timeval replaced due to Posix conformance
+gl_cv_sys_struct_timeval_tv_sec=yes
+
+# We don't want pthread.h to be picked up just because it defines timespec
+gl_cv_sys_struct_timespec_in_pthread_h=no
+# Or at all...
+ac_cv_header_pthread_h=no
+
+# We don't want to check for these functions
+# because they are implemented in libwinpthread.
+ac_cv_search_clock_gettime="none required"
+ac_cv_func_clock_gettime=no
+ac_cv_func_clock_settime=no
+
 # ACL functions are implemented in w32.c
 ac_cv_search_acl_get_file="none required"
 ac_cv_func_acl_get_file=yes
@@ -59,7 +74,12 @@ ac_cv_func_getsockname=yes
 ac_cv_func_getpeername=yes
 # Implemented as sys_socket in w32.c
 ac_cv_func_socket=yes
+# Implemented as sys_getaddrinfo in w32.c
+ac_cv_func_getaddrinfo=yes
+# Implemented as an inline function in ws2tcpip.h
+ac_cv_func_gai_strerror=yes
 # Implemented in w32.c
+ac_cv_func_mkostemp=yes
 ac_cv_func_readlink=yes
 ac_cv_func_symlink=yes
 # Avoid run-time tests of readlink and symlink, which will fail
@@ -67,6 +87,10 @@ gl_cv_func_readlink_works=yes
 gl_cv_func_symlink_works=yes
 ac_cv_func_readlinkat=yes
 ac_cv_func_faccessat=yes
+# Implemented in w32.c
+ac_cv_func_fcntl=yes
+gl_cv_func_fcntl_f_dupfd_cloexec=yes
+gl_cv_func_fcntl_f_dupfd_works=yes
 # We don't need fdopendir
 ac_cv_func_fdopendir="not-needed"
 gl_cv_func_fdopendir_works="no-but-not-needed-so-yes"
@@ -95,6 +119,7 @@ ac_cv_func_getloadavg=yes
 # Avoid compiling gnulib mktime
 gl_cv_func_working_mktime=yes
 # Implemented in w32.c
+ac_cv_func_pipe2=yes
 ac_cv_have_decl_unsetenv=yes
 ac_cv_func_unsetenv=yes
 gt_cv_func_unsetenv_ret='int'
@@ -104,3 +129,5 @@ gl_cv_func_stat_file_slash=yes
 ac_cv_func_random=yes
 # Implemented in w32.c as sys_putenv
 gl_cv_func_svid_putenv=yes
+# GCC warnings that produce too much noise
+gl_cv_warn_c__Wredundant_decls=no