Minor tweaks in comments to scripts and INSTALL.MSYS.

3 files changed, 34 insertions, 5 deletions

diff --git a/nt/INSTALL.MSYS b/nt/INSTALL.MSYS
index 4347407d774..05ba6c65b22 100644
--- a/nt/INSTALL.MSYS
+++ b/nt/INSTALL.MSYS
@@ -114,14 +114,16 @@ Windows 9X as well).
   (We recommend that you refrain from installing the MSYS Texinfo
   package, which is part of msys-base, because it might produce mixed
   EOL format when installing Info files.  Instead, install the MinGW
-  port of Texinfo, see the URL below.)
+  port of Texinfo, see the ezwinports URL below.)
 
   At this point, you should be ready to configure and build Emacs in
   its basic configuration.  Skip to the "Generating the configure
   script" section for the build instructions.  If you want to build it
   with image support and other optional libraries, read about the
   optional libraries near the end of this document, before you start
-  the build.
+  the build.  Also, consider installing additional MinGW packages that
+  are required/recommended, especially if you are building from the
+  Bazaar repository, as described in the next section.
 
 ** Installing MinGW and MSYS manually
 
@@ -193,9 +195,9 @@ Windows 9X as well).
   building a trivial "hello, world!" program, and make sure that it
   builds without any error messages and the binary works when run.
 
-*** Installing MSYS
+*** MSYS
 
-  You will also need a reasonably full MSYS installation.  MSYS is an
+  You will need a reasonably full MSYS installation.  MSYS is an
   environment needed to run the Posix configure scripts and the
   resulting Makefile's, in order to produce native Windows binaries
   using the MinGW compiler and runtime libraries.  Here's the list of
diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site
index 8faf8e0dafe..96cda2d624a 100644
--- a/nt/mingw-cfg.site
+++ b/nt/mingw-cfg.site
@@ -1,5 +1,32 @@
 #! /bin/sh
 # Site defaults for the MinGW configuration of GNU Emacs.
+#
+# This file's purpose is to short-circuit configure-time tests for
+# which we want to provide the results instead of letting the
+# 'configure' script do that.  This is mainly for features that
+# 'configure' tests that are implemented as part of Emacs sources, not
+# as part of system libraries.  The idea is to set shell variables
+# that appear to the script as cached values.
+#
+# For each header file foo.h you want to supply test results, set the
+# 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).
+#
+# 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
+# determined by what 'configure' expects; sometimes it could be "not
+# needed" or whatever, see the examples below.  In addition, you may
+# need to set the various gl_cv_* variables for those tests that come
+# from gnulib.
+#
+# 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.
 
 # We want to use getopt.h from gnulib
 ac_cv_header_getopt_h=no
diff --git a/nt/msysconfig.sh b/nt/msysconfig.sh
index 97aeb6e6118..95e56f64c42 100644
--- a/nt/msysconfig.sh
+++ b/nt/msysconfig.sh
@@ -27,7 +27,7 @@
 ## results when running under MSYS with the purpose of configuring
 ## Emacs for the MinGW MS-Windows build.  Rather than asking users to
 ## type these tweaks every time they configure the package, we provide
-## this helper scripts which takes care of the mundane things.
+## this helper script which takes care of the mundane things.
 
 ### Code: