Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org

[bpt/emacs.git] / nt / INSTALL

diff --git a/nt/INSTALL b/nt/INSTALL
index a52bdd8..949a4e4 100644 (file)
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -115,11 +115,6 @@ Windows 9X as well).
   MSYS Texinfo, after installing it as part of msys-base, invoke the
   command "mingw-get remove msys-texinfo".)
 
-  In addition, building Emacs from the development repository requires
-  pkg-config to be installed.  As the MinGW project does not offer it,
-  you will have to install it from elsewhere; see below (search for
-  "pkg-config").
-
   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
@@ -179,9 +174,7 @@ Windows 9X as well).
      Available from http://sourceforge.net/projects/ezwinports/files/.
 
    . pkg-config (invoked by the configure script to look for optional
-     packages; _required_ for building from the development
-     repository, as some components of pkg-config are needed to run
-     the autoconf and aclocal scripts)
+     packages)
 
      Available from http://www.gtk.org/download/win32.php
 
@@ -238,6 +231,16 @@ Windows 9X as well).
   install the packages manually, we recommend to use the Windows port
   of the 'bsdtar' program, already mentioned above.
 
+  MSYS packages should be installed in a separate tree from MinGW.
+  For example, use D:\MSYS or D:\usr\MSYS as the top-level directory
+  from which you unpack all of the MSYS packages.
+
+  After installing Automake and Autoconf, make sure any of the *.m4
+  files you might have in your MinGW installation also exist in the
+  MSYS installation tree, in the share/aclocal directory.  Those *.m4
+  files which exist in the MinGW tree, but not in the MSYS tree should
+  be copied there.
+
   If/when you are confident in your MinGW/MSYS installation, and want
   to speed up the builds, we recommend installing a pre-release
   version of Make from here:
@@ -265,10 +268,6 @@ Windows 9X as well).
   states the missing or incompatible DLL; be sure to find and install
   these missing DLLs.
 
-  MSYS packages should be installed in a separate tree from MinGW.
-  For example, use D:\MSYS or D:\usr\MSYS as the top-level directory
-  from which you unpack all of the MSYS packages.
-
   Do NOT add the MSYS bin directory to your Windows Path!  Only the
   MinGW bin directory should be on Path.  When you install MSYS, it
   creates a shortcut on your desktop that invokes the MSYS Bash shell