Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de

[bpt/emacs.git] / nt / mingw-cfg.site

diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site
index 325bba2..0be24dd 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
@@ -31,6 +32,9 @@
 # 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
+
 # ACL functions are implemented in w32.c
 ac_cv_search_acl_get_file="none required"
 ac_cv_func_acl_get_file=yes