[Emacs-diffs] master d2458e5 1/2: MS-Windows followup for switch from Automake

[Eli Zaretskii]

branch: master
commit d2458e5f1c003a85eb2de70ecb08d8951d5a3c3e
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    MS-Windows followup for switch from Automake
    
    * nt/INSTALL:
    * nt/INSTALL.W64: Remove references to Automake.  (Bug#26100)
---
 nt/INSTALL     | 30 ++++++++++++------------------
 nt/INSTALL.W64 |  6 +++---
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/nt/INSTALL b/nt/INSTALL
index 553ca5e..b7f47a5 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -182,8 +182,8 @@ build will run on Windows 9X and newer systems).
   removal in the mingw-get GUI, then select Installation->Apply Changes.)
 
   (Similarly, we recommend to refrain from installing the MinGW
-  Automake and Autoconf packages; instead, install their MSYS builds
-  available from the ezwinports site, see below.)
+  Autoconf package; instead, install its MSYS build available from the
+  ezwinports site, see below.)
 
   At this point, you should be ready to configure and build Emacs in
   its basic configuration.  Skip to the "Generating the configure
@@ -290,11 +290,9 @@ build will run on Windows 9X and newer systems).
      These should only be needed if you intend to build development
      versions of Emacs from the repository.
 
-   . Additional packages (needed only if building from the
-     repository): Automake and Autoconf.  They are available from
-     here:
+   . Additional package (needed only if building from the repository):
+     Autoconf.  It is available from here:
 
-       
http://sourceforge.net/projects/ezwinports/files/automake-1.11.6-msys-bin.zip/download
        
http://sourceforge.net/projects/ezwinports/files/autoconf-2.65-msys-bin.zip/download
 
   MSYS packages are distributed as .tar.lzma compressed archives.  To
@@ -305,11 +303,10 @@ build will run on Windows 9X and newer systems).
   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.
+  After installing 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
@@ -382,13 +379,10 @@ build will run on Windows 9X and newer systems).
      $ ./autogen.sh
      Checking whether you have the necessary tools...
      (Read INSTALL.REPO for more details on building Emacs)
-
-     Checking for autoconf (need at least version 2.65)...
-     ok
-     Checking for automake (need at least version 1.11)...
-     ok
-     Your system has the required tools, running autoreconf...
-     Installing git hooks...
+     Checking for autoconf (need at least version 2.65) ... ok
+     Your system has the required tools.
+     Building aclocal.m4 ...
+     Running 'autoreconf -fi -I m4' ...
      You can now run './configure'.
 
   If the script fails because it cannot find Git, you will need to
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index a12b7fc..b40f223 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -67,9 +67,9 @@ packages (you can copy and paste it into the shell with Shift 
+ Insert):
   mingw-w64-x86_64-gnutls \
   mingw-w64-x86_64-zlib
 
-The packages include the base developer tools (autoconf, automake, grep, make,
-etc.), the compiler toolchain (gcc, gdb, etc.), several image libraries, an
-XML library, the GnuTLS (transport layer security) library, and zlib for
+The packages include the base developer tools (autoconf, grep, make, etc.),
+the compiler toolchain (gcc, gdb, etc.), several image libraries, an XML
+library, the GnuTLS (transport layer security) library, and zlib for
 decompressing text.  Only the first three packages are required (base-devel,
 toolchain, xpm-nox); the rest are optional.  You can select only part of the
 libraries if you don't need them all.