Remove files used by the old MS-Windows specific build procedure

* nt/configure.bat: Remove everything except the blurb about the new build procedure. * make-dist: Remove references to makefile.w32-in in various directories, and to files in nt/ that were deleted. * etc/NEWS: Mention the fact that the files were dropped.
author: Eli Zaretskii 2015-08-15 10:56:51 +0300
committer: Eli Zaretskii 2015-08-15 10:56:51 +0300
commit: 8db2b2a7d3fc3e4475bc4137c11069a69a3234ec (patch)
tree: 9c3141edc2818d2e2909f2ad89a9620a0ec45937 /nt
parent: 8fa49a6786bd71aa91b1e82709bc1852a65c4646 (diff)
download: emacs-8db2b2a7d3fc3e4475bc4137c11069a69a3234ec.tar.gz
emacs-8db2b2a7d3fc3e4475bc4137c11069a69a3234ec.zip
10 files changed, 3 insertions, 4797 deletions
diff --git a/nt/INSTALL.OLD b/nt/INSTALL.OLD
deleted file mode 100644
index 89e87b2d896..00000000000
--- a/nt/INSTALL.OLD
+++ /dev/null
@@ -1,752 +0,0 @@
-                    Building and Installing Emacs on Windows
-                          (from 95 to 7 and beyond)
-  Copyright (C) 2001-2015 Free Software Foundation, Inc.
-  See the end of the file for license conditions.
-*** This method of building Emacs is no longer supported. ***
-    It may fail to produce a correctly working Emacs.
-    Do not report bugs associated with this build method.
-    Instead, follow the new instructions in INSTALL.
-* For the impatient
-  Here are the concise instructions for configuring and building the
-  native Windows binary of Emacs, for those who want to skip the
-  complex explanations and ``just do it'':
-  Do not use this recipe with Cygwin.  For building on Cygwin,
-  use the normal installation instructions, ../INSTALL.
-  Do not use these instructions with MSYS environment.  For building
-  the native Windows binary with MinGW and MSYS, follow the
-  instructions in the file INSTALL in this directory.
-  For building without MSYS, if you have a Cygwin or MSYS port of Bash
-  on your Path, you will be better off removing it from PATH.  (For
-  details, search for "MSYS sh.exe" below.)
-  1. Change to the `nt' directory (the directory of this file):
-       cd nt
-  2. Run configure.bat.
-  2a.If you use MSVC, set up the build environment by running the
-     SetEnv.cmd batch file from the appropriate SDK directory.  (Skip
-     this step if you are using MinGW.)  For example:
-       "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Debug
-      if you are going to compile a debug version, or
-       "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Release
-      if you are going to compile an optimized version.
-  2b.From the COMMAND.COM/CMD.EXE command prompt type:
-       configure
-     From a Unixy shell prompt:
-       cmd /c configure.bat
-     or
-       command.com /c configure.bat
-  3. Run the Make utility suitable for your environment.  If you build
-     with the Microsoft's Visual C compiler:
-       nmake
-     For the development environments based on GNU GCC (MinGW, MSYS,
-     Cygwin - but see notes about Cygwin make below), depending on how
-     Make is called, it could be:
-       make
-     or
-       mingw32-make
-     or
-       gnumake
-     or
-       gmake
-     (If you are building from Bazaar, say "make bootstrap" or "nmake
-     bootstrap" instead, and avoid using Cygwin make.)
-     With GNU Make, you can use the -j command-line option to have
-     Make execute several commands at once, like this:
-       gmake -j 2
-     (With versions of GNU Make before 3.82, you need also set the
-     XMFLAGS variable, like this:
-       gmake -j 2 XMFLAGS="-j 2"
-     The XMFLAGS variable overrides the default behavior of version
-     3.82 and older of GNU Make on Windows, whereby recursive Make
-     invocations reset the maximum number of simultaneous commands to
-     1.  The above command allows up to 4 simultaneous commands at
-     once in the top-level Make, and up to 3 in each one of the
-     recursive Make's.)
-  4. Generate the Info manuals (only if you are building out of Bazaar,
-     and if you have makeinfo.exe installed):
-     make info
-     (change "make" to "nmake" if you use MSVC).
-  5. Install the produced binaries:
-     make install
-  That's it!
-  If these short instructions somehow fail, read the rest of this
-  file.
-* Preliminaries
-  If you want to build a Cygwin port of Emacs, use the instructions in
-  the INSTALL file in the main Emacs directory (the parent of this
-  directory).  These instructions are for building a native Windows
-  binary of Emacs.
-  If you used WinZip to unpack the distribution, we suggest to
-  remove the files and unpack again with a different program!
-  WinZip is known to create some subtle and hard to debug problems,
-  such as converting files to DOS CR-LF format, not creating empty
-  directories, etc.  We suggest to use djtarnt.exe from the GNU FTP
-  site.  For modern formats, such as .tar.xz, we suggest bsdtar.exe
-  from the libarchive package; its precompiled Windows binaries are
-  available from this site:
-    http://sourceforge.net/projects/ezwinports/files/
-  In addition to this file, if you build a development snapshot, you
-  should also read INSTALL.REPO in the parent directory.
-* Supported development environments
-  To compile Emacs, you will need either Microsoft Visual C++ 2.0, or
-  later and nmake, or a Windows port of GCC 2.95 or later with MinGW
-  and Windows API support and a port of GNU Make.  You can use the Cygwin
-  ports of GCC, but Emacs requires the MinGW headers and libraries to
-  build (latest versions of the Cygwin toolkit, at least since v1.3.3,
-  include the MinGW headers and libraries as an integral part).
-  The rest of this file assumes you have a working development
-  environment.  If you just installed such an environment, try
-  building a trivial C "Hello world" program, and see if it works.  If
-  it doesn't work, resolve that problem first!  If you use Microsoft
-  Visual Studio .NET 2003, don't forget to run the VCVARS32.BAT batch
-  file from the `Bin' subdirectory of the directory where you have
-  installed VS.NET.  With other versions of MSVC, run the SetEnv.cmd
-  batch file from the `Bin' subdirectory of the directory where you
-  have the SDK installed.
-  If you use the MinGW port of GCC and GNU Make to build Emacs, there
-  are some compatibility issues wrt Make and the shell that is run by
-  Make, either the standard COMMAND.COM/CMD.EXE supplied with Windows
-  or sh.exe, a port of a Unixy shell.  For reference, below is a list
-  of which builds of GNU Make are known to work or not, and whether
-  they work in the presence and/or absence of sh.exe, the Cygwin port
-  of Bash.  Note that any version of Make that is compiled with Cygwin
-  will only work with Cygwin tools, due to the use of Cygwin style
-  paths.  This means Cygwin Make is unsuitable for building parts of
-  Emacs that need to invoke Emacs itself (leim and "make bootstrap",
-  for example).  Also see the Trouble-shooting section below if you
-  decide to go ahead and use Cygwin make.
-  In addition, using 4NT or TCC as your shell is known to fail the
-  build process, at least since 4NT version 3.01.  Use CMD.EXE, the
-  default Windows shell, instead.  MSYS sh.exe also appears to cause
-  various problems, e.g., it is known to cause failures in commands
-  like "cmd /c FOO" in the Makefiles, because it thinks "/c" is a
-  Unix-style file name that needs conversion to the Windows format.
-  If you have MSYS installed, try "make SHELL=cmd.exe" to force the
-  use of cmd.exe instead of the MSYS sh.exe.
-                                         sh exists     no sh
-    cygwin b20.1 make (3.75):            fails[1, 5]   fails[2, 5]
-    MSVC compiled gmake 3.77:            okay          okay
-    MSVC compiled gmake 3.78.1:          okay          okay
-    MSVC compiled gmake 3.79.1:          okay          okay
-    mingw32/gcc-2.92.2 make (3.77):      okay          okay[4]
-    cygwin compiled gmake 3.77:          fails[1, 5]   fails[2, 5]
-    cygwin compiled make 3.78.1:         fails[5]      fails[2, 5]
-    cygwin compiled make 3.79.1:         fails[3, 5]   fails[2?, 5]
-    cygwin compiled make 3.80:           okay[6]       fails?[7]
-    cygwin compiled make 3.81:           fails         fails?[7]
-    mingw32 compiled make 3.79.1:        okay          okay
-    mingw32 compiled make 3.80:          okay          okay[7]
-    mingw32 compiled make 3.81:          okay          okay[8]
-  Notes:
-    [1] doesn't cope with makefiles with DOS line endings, so must mount
-        emacs source with text!=binary.
-    [2] fails when needs to invoke shell commands; okay invoking gcc etc.
-    [3] requires LC_MESSAGES support to build; cannot build with early
-        versions of Cygwin.
-    [4] may fail on Windows 9X and Windows ME; if so, install Bash.
-    [5] fails when building leim due to the use of cygwin style paths.
-        May work if building emacs without leim.
-    [6] need to uncomment 3 lines in nt/gmake.defs that invoke `cygpath'
-        (look for "cygpath" near line 85 of gmake.defs).
-    [7] not recommended; please report if you try this combination.
-    [8] tested only on Windows XP.
-  Other compilers may work, but specific reports from people that have
-  tried suggest that the Intel C compiler (for example) may produce an
-  Emacs executable with strange filename completion behavior.  Unless
-  you would like to assist by finding and fixing the cause of any bugs
-  like this, we recommend the use of the supported compilers mentioned
-  in the previous paragraph.
-  You will also need a copy of the POSIX cp, rm and mv programs.  These
-  and other useful POSIX utilities can be obtained from one of several
-  projects:
-  * http://gnuwin32.sourceforge.net/              ( GnuWin32 )
-  * http://www.mingw.org/                         ( MinGW    )
-  * http://www.cygwin.com/                        ( Cygwin   )
-  * http://unxutils.sourceforge.net/              ( UnxUtils )
-  If you build Emacs on 16-bit versions of Windows (9X or ME), we
-  suggest to install the Cygwin port of Bash.  That is because the
-  native Windows shell COMMAND.COM is too limited; the Emacs build
-  procedure tries very hard to support even such limited shells, but
-  as none of the Windows developers of Emacs work on Windows 9X, we
-  cannot guarantee that it works without a more powerful shell.
-  Additional instructions and help for building Emacs on Windows can be
-  found at the Emacs Wiki:
-    http://www.emacswiki.org/cgi-bin/wiki/WThirtyTwoInstallationKit
-  and on these URLs:
-    http://ourcomments.org/Emacs/w32-build-emacs.html
-    http://derekslager.com/blog/posts/2007/01/emacs-hack-3-compile-emacs-from-cvs-on-windows.ashx
-  Both of those pages were written before Emacs switched from CVS to
-  Bazaar, but the parts about building Emacs still apply in Bazaar.
-  The second URL has instructions for building with MSVC, as well as
-  with MinGW, while the first URL covers only MinGW, but has more
-  details about it.
-* Configuring
-  Configuration of Emacs is now handled by running configure.bat in the
-  `nt' subdirectory.  It will detect which compiler you have available,
-  and generate makefiles accordingly.  You can override the compiler
-  detection, and control optimization and debug settings, by specifying
-  options on the command line when invoking configure.
-  To configure Emacs to build with GCC or MSVC, whichever is available,
-  simply change to the `nt' subdirectory and run `configure.bat' with no
-  options.  To see what options are available, run `configure --help'.
-  Do NOT use the --no-debug option to configure.bat unless you are
-  absolutely sure the produced binaries will never need to be run under
-  a debugger.
-  Because of limitations of the stock Windows command shells, special
-  care is needed to pass some characters in the arguments of the
-  --cflags and --ldflags options.  Backslashes should not be used in
-  file names passed to the compiler and linker via these options.  Use
-  forward slashes instead.  If the arguments to these two options
-  include the `=' character, like when passing a -DFOO=bar preprocessor
-  option, the argument with the `=' character should be enclosed in
-  quotes, like this:
-    configure --cflags "-DFOO=bar"
-  Support for options that include the `=' character require "command
-  extensions" to be enabled.  (They are enabled by default, but your
-  system administrator could have changed that.  See "cmd /?" for
-  details.)  If command extensions are disabled, a warning message might
-  be displayed informing you that "using parameters that include the =
-  character by enclosing them in quotes will not be supported."
-  You may also use the --cflags and --ldflags options to pass
-  additional parameters to the compiler and linker, respectively; they
-  are frequently used to pass -I and -L flags to specify supplementary
-  include and library directories.  If a directory name includes
-  spaces, you will need to enclose it in quotes, as follows
-  -I"C:/Program Files/GnuTLS-2.10.1/include".  Note that only the
-  directory name is enclosed in quotes, not the entire argument.  Also
-  note that this functionality is only supported if command extensions
-  are available.  If command extensions are disabled and you attempt to
-  use this functionality you may see the following warning message
-  "Error in --cflags argument: ... Backslashes and quotes cannot be
-  used with --cflags.  Please use forward slashes for filenames and
-  paths (e.g. when passing directories to -I)."
-  N.B.  It is normal to see a few error messages output while configure
-  is running, when gcc support is being tested.  These cannot be
-  suppressed because of limitations in the Windows 9X command.com shell.
-  You are encouraged to look at the file config.log which shows details
-  for failed tests, after configure.bat finishes.  Any unexplained failure
-  should be investigated and perhaps reported as a bug (see the section
-  about reporting bugs in the file README in this directory and in the
-  Emacs manual).
-* Optional image library support
-  In addition to its "native" image formats (pbm and xbm), Emacs can
-  handle other image types: xpm, tiff, gif, png, jpeg and experimental
-  support for svg.
-  To build Emacs with support for them, the corresponding headers must
-  be in the include path when the configure script is run.  This can
-  be setup using environment variables, or by specifying --cflags
-  -I... options on the command-line to configure.bat.  The configure
-  script will report whether it was able to detect the headers.  If
-  the results of this testing appear to be incorrect, please look for
-  details in the file config.log: it will show the failed test
-  programs and compiler error messages that should explain what is
-  wrong.  (Usually, any such failures happen because some headers are
-  missing due to bad packaging of the image support libraries.)
-  Note that any file path passed to the compiler or linker must use
-  forward slashes; using backslashes will cause compiler warnings or
-  errors about unrecognized escape sequences.
-  To use the external image support, the DLLs implementing the
-  functionality must be found when Emacs first needs them, either on the
-  PATH, or in the same directory as emacs.exe.  Failure to find a
-  library is not an error; the associated image format will simply be
-  unavailable.  Note that once Emacs has determined that a library can
-  not be found, there's no way to force it to try again, other than
-  restarting.  See the variable `dynamic-library-alist' to configure the
-  expected names of the libraries.
-  Some image libraries have dependencies on one another, or on zlib.
-  For example, tiff support depends on the jpeg library.  If you did not
-  compile the libraries yourself, you must make sure that any dependency
-  is in the PATH or otherwise accessible and that the binaries are
-  compatible (for example, that they were built with the same compiler).
-  Binaries for the image libraries (among many others) can be found at
-  the GnuWin32 project.  PNG, JPEG and TIFF libraries are also
-  included with GTK, which is installed along with other Free Software
-  that requires it.  These are built with MinGW, but they can be used
-  with both GCC/MinGW and MSVC builds of Emacs.  See the info on
-  http://ourcomments.org/Emacs/w32-build-emacs.html, under "How to Get
-  Images Support", for more details about installing image support
-  libraries.  Note specifically that, due to some packaging snafus in
-  the GnuWin32-supplied image libraries, you will need to download
-  _source_ packages for some of the libraries in order to get the
-  header files necessary for building Emacs with image support.
-  If GTK 2.0 is installed, addpm will arrange for its image libraries
-  to be on the DLL search path for Emacs.
-  For PNG images, we recommend to use versions 1.4.x and later of
-  libpng, because previous versions had security issues.  You can find
-  precompiled libraries and headers on the GTK download page for
-  Windows (http://www.gtk.org/download/win32.php).
-  Versions 1.4.0 and later of libpng are binary incompatible with
-  earlier versions, so Emacs will only look for libpng libraries which
-  are compatible with the version it was compiled against.  That
-  version is given by the value of the Lisp variable `libpng-version';
-  e.g., 10403 means version 1.4.3.  The variable `dynamic-library-alist'
-  is automatically set to name only those DLL names that are known to
-  be compatible with the version given by `libpng-version'.  If PNG
-  support does not work for you even though you have the support DLL
-  installed, check the name of the installed DLL against
-  `dynamic-library-alist' and the value of `libpng-version', and
-  download compatible DLLs if needed.
-* Optional GnuTLS support
-  If configure.bat finds the gnutls/gnutls.h file in the include path,
-  Emacs is built with GnuTLS support by default; to avoid that you can
-  pass the argument --without-gnutls.
-  In order to support GnuTLS at runtime, a GnuTLS-enabled Emacs must
-  be able to find the relevant DLLs during startup; failure to do so
-  is not an error, but GnuTLS won't be available to the running
-  session.
-  You can get pre-built binaries (including any required DLL and the
-  header files) at http://sourceforge.net/projects/ezwinports/files/.
-* Optional libxml2 support
-  If configure.bat finds the libxml/HTMLparser.h file in the include path,
-  Emacs is built with libxml2 support by default; to avoid that you can
-  pass the argument --without-libxml2.
-  In order to support libxml2 at runtime, a libxml2-enabled Emacs must
-  be able to find the relevant DLLs during startup; failure to do so
-  is not an error, but libxml2 features won't be available to the
-  running session.
-  One place where you can get pre-built Windows binaries of libxml2
-  (including any required DLL and the header files) is here:
-     http://sourceforge.net/projects/ezwinports/files/
-  To compile Emacs with libxml2 from that site, you will need to pass
-  the "--cflags -I/path/to/include/libxml2" option to configure.bat,
-  because libxml2 header files are installed in the include/libxml2
-  subdirectory of the directory where you unzip the binary
-  distribution.  Other binary distributions might use other
-  directories, although include/libxml2 is the canonical place where
-  libxml2 headers are installed on Posix platforms.
-  You will also need to install the libiconv "development" tarball,
-  because the libiconv headers need to be available to the compiler
-  when you compile with libxml2 support.  A MinGW port of libiconv can
-  be found on the MinGW site:
-   http://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/
-  You need the libiconv-X.Y.Z-N-mingw32-dev.tar.lzma tarball from that
-  site.
-* Experimental SVG support
-  SVG support is currently experimental, and not built by default.
-  Specify --with-svg and ensure you have all the dependencies in your
-  include path.  Unless you have built a minimalist librsvg yourself
-  (untested), librsvg depends on a significant chunk of GTK+ to build,
-  plus a few Gnome libraries, libxml2, libbz2 and zlib at runtime.  The
-  easiest way to obtain the dependencies required for building is to
-  download a pre-bundled GTK+ development environment for Windows.
-  GTK puts its header files all over the place, so you will need to
-  run pkgconfig to list the include path you will need (either passed
-  to configure.bat as --cflags options, or set in the environment).
-  To use librsvg at runtime, ensure that librsvg and its dependencies
-  are on your PATH.  If you didn't build librsvg yourself, you will
-  need to check with where you downloaded it from for the
-  dependencies, as there are different build options.  If it is a
-  short list, then it most likely only lists the immediate
-  dependencies of librsvg, but the dependencies themselves have
-  dependencies - so don't download individual libraries from GTK+,
-  download and install the whole thing.  If you think you've got all
-  the dependencies and SVG support is still not working, check your
-  PATH for other libraries that shadow the ones you downloaded.
-  Libraries of the same name from different sources may not be
-  compatible, this problem was encountered with libbzip2 from GnuWin32
-  with libcroco from gnome.org.
-  If you can see etc/images/splash.svg, then you have managed to get
-  SVG support working.  Congratulations for making it through DLL hell
-  to this point.  You'll probably find that some SVG images crash
-  Emacs.  Problems have been observed in some images that contain
-  text, they seem to be a problem in the Windows port of Pango, or
-  maybe a problem with the way Cairo or librsvg is using it that
-  doesn't show up on other platforms.
-* Optional extra runtime checks
-  The configure.bat option --enable-checking builds Emacs with some
-  optional extra runtime checks and assertions enabled.  This may be
-  useful for debugging.
-* Optional extra libraries
-  You can pass --lib LIBNAME option to configure.bat to cause Emacs to
-  link with the specified library.  You can use this option more than once.
-* Building
-  After running configure, simply run the appropriate `make' program for
-  your compiler to build Emacs.  For MSVC, this is nmake; for GCC, it is
-  GNU make.  (If you are building out of Bazaar, say "make bootstrap" or
-  "nmake bootstrap" instead.)
-  As the files are compiled, you will see some warning messages
-  declaring that some functions don't return a value, or that some data
-  conversions will be lossy, etc.  You can safely ignore these messages.
-  The warnings may be fixed in the main FSF source at some point, but
-  until then we will just live with them.
-  With GNU Make, you can use the -j command-line option to have Make
-  execute several commands at once, like this:
-    gmake -j 4 XMFLAGS="-j 3"
-  The XMFLAGS variable overrides the default behavior of GNU Make on
-  Windows, whereby recursive Make invocations reset the maximum number
-  of simultaneous commands to 1.  The above command allows up to 4
-  simultaneous commands at once in the top-level Make, and up to 3 in
-  each one of the recursive Make's; you can use other numbers of jobs,
-  if you wish.
-  If you are building from Bazaar, the following commands will produce
-  the Info manuals (which are not part of the Bazaar sources):
-    make info
-  or
-    nmake info
-  Note that you will need makeinfo.exe (from the GNU Texinfo package)
-  in order for this command to succeed.
-* Installing
-  To install Emacs after it has compiled, simply run `nmake install'
-  or `make install', depending on which version of the Make utility
-  do you have.
-  By default, Emacs will be installed in the location where it was
-  built, but a different location can be specified either using the
-  --prefix option to configure, or by setting INSTALL_DIR when running
-  make, like so:
-     make install INSTALL_DIR=D:/emacs
-  (for `nmake', type "nmake install INSTALL_DIR=D:/emacs" instead).
-  The install process will run addpm to setup the registry entries, and
-  to create a Start menu icon for Emacs.
-* Make targets
-  The following make targets may be used by users building the source
-  distribution, or users who have checked out of Bazaar after
-  an initial bootstrapping.
-  make
-  Builds Emacs from the available sources and pre-compiled lisp files.
-  make install
-  Installs programs to the bin directory, and runs addpm to create
-  Start Menu icons.
-  make clean
-  Removes object and executable files produced by the build process in
-  the current configuration.  After make clean, you can rebuild with
-  the same configuration using make.
-  make distclean
-  In addition to the files removed by make clean, this also removes
-  Makefiles and other generated files to get back to the state of a
-  freshly unpacked source distribution.  Note that this will not remove
-  installed files, or the results of builds performed with different
-  compiler or optimization options than the current configuration.
-  After make distclean, it is necessary to run configure.bat followed
-  by make to rebuild.
-  make cleanall
-  Removes object and executable files that may have been created by
-  previous builds with different configure options, in addition to
-  the files produced by the current configuration.
-  make realclean
-  Removes the installed files in the bin subdirectory in addition to
-  the files removed by make cleanall.
-  make dist
-  Builds Emacs from the available sources and pre-compiled lisp files.
-  Packages Emacs binaries as full distribution and barebin distribution.
-  The following targets are intended only for use with the Bazaar sources.
-  make bootstrap
-  Creates a temporary emacs binary with lisp source files and
-  uses it to compile the lisp files.  Once the lisp files are built,
-  emacs is redumped with the compiled lisp.
-  make recompile
-  Recompiles any changed lisp files after an update.  This saves
-  doing a full bootstrap after every update.  If this or a subsequent
-  make fail, you probably need to perform a full bootstrap, though
-  running this target multiple times may eventually sort out the
-  interdependencies.
-  make maintainer-clean
-  Removes everything that can be recreated, including compiled lisp
-  files, to get back to the state of a fresh Bazaar tree.  After make
-  maintainer-clean, it is necessary to run configure.bat and make
-  bootstrap to rebuild.  Occasionally it may be necessary to run this
-  target after an update.
-* Creating binary distributions
-  Binary distributions (full and barebin distributions) can be
-  automatically built and packaged from source tarballs or a repository
-  checkout.
-  When building Emacs binary distributions, the --distfiles argument
-  to configure.bat specifies files to be included in the bin directory
-  of the binary distributions. This is intended for libraries that are
-  not built as part of Emacs, e.g. image libraries.
-  For example, specifying
-        --distfiles D:\distfiles\libXpm.dll
-  results in libXpm.dll being copied from D:\distfiles to the
-  bin directory before packaging starts.
-  Multiple files can be specified using multiple --distfiles arguments:
-        --distfiles D:\distfiles\libXpm.dll --distfiles C:\jpeglib\jpeg.dll
-  For packaging the binary distributions, the 'dist' make target uses
-  7-Zip (http://www.7-zip.org), which must be installed and available
-  on the Windows Path.
-* Trouble-shooting
-  The main problems that are likely to be encountered when building
-  Emacs stem from using an old version of GCC, or old MinGW or Windows API
-  headers.  Additionally, Cygwin ports of GNU make may require the Emacs
-  source tree to be mounted with text!=binary, because the makefiles
-  generated by configure.bat necessarily use DOS line endings.  Also,
-  Cygwin ports of make must run in UNIX mode, either by specifying
-  --unix on the command line, or MAKE_MODE=UNIX in the environment.
-  When configure runs, it attempts to detect when GCC itself, or the
-  headers it is using, are not suitable for building Emacs.  GCC version
-  2.95 or later is needed, because that is when the Windows port gained
-  sufficient support for anonymous structs and unions to cope with some
-  definitions from winnt.h that are used by addsection.c.
-  Older versions of the Windows API headers that come with Cygwin and MinGW
-  may be missing some definitions required by Emacs, or broken in other
-  ways.  In particular, uniscribe APIs were added to MinGW CVS only on
-  2006-03-26, so releases from before then cannot be used.
-  When in doubt about correctness of what configure did, look at the file
-  config.log, which shows all the failed test programs and compiler
-  messages associated with the failures.  If that doesn't give a clue,
-  please report the problems, together with the relevant fragments from
-  config.log, as bugs.
-  If configure succeeds, but make fails, install the Cygwin port of
-  Bash, even if the table above indicates that Emacs should be able to
-  build without sh.exe.  (Some versions of Windows shells are too dumb
-  for Makefile's used by Emacs.)
-  If you are using certain Cygwin builds of GCC, such as Cygwin version
-  1.1.8, you may need to specify some extra compiler flags like so:
-    configure --with-gcc --cflags -mwin32 --cflags -D__MSVCRT__
-      --ldflags -mwin32
-  However, the latest Cygwin versions, such as 1.3.3, don't need those
-  switches; you can simply use "configure --with-gcc".
-  We will attempt to auto-detect the need for these flags in a future
-  release.
-* Debugging
-  You should be able to debug Emacs using the debugger that is
-  appropriate for the compiler you used, namely DevStudio or Windbg if
-  compiled with MSVC, or GDB if compiled with GCC.  (GDB for Windows
-  is available from the MinGW site, http://www.mingw.org/download.shtml.)
-  When Emacs aborts due to a fatal internal error, Emacs on Windows
-  pops up an Emacs Abort Dialog asking you whether you want to debug
-  Emacs or terminate it.  If Emacs was built with MSVC, click YES
-  twice, and Windbg or the DevStudio debugger will start up
-  automatically.  If Emacs was built with GCC, first start GDB and
-  attach it to the Emacs process with the "gdb -p EMACS-PID" command,
-  where EMACS-PID is the Emacs process ID (which you can see in the
-  Windows Task Manager), type the "continue" command inside GDB, and
-  only then click YES on the abort dialog.  This will pass control to
-  the debugger, and you will be able to debug the cause of the fatal
-  error.
-  The single most important thing to find out when Emacs aborts or
-  crashes is where did that happen in the Emacs code.  This is called
-  "backtrace".
-  Emacs on Windows uses more than one thread.  When Emacs aborts due
-  to a fatal error, the current thread may not be the application
-  thread running Emacs code.  Therefore, to produce a meaningful
-  backtrace from a debugger, you need to instruct it to show the
-  backtrace for every thread.  With GDB, you do it like this:
-   (gdb) thread apply all backtrace
-  To run Emacs under a debugger to begin with, simply start it from
-  the debugger.  With GDB, chdir to the `src' directory (if you have
-  the source tree) or to a directory with the `.gdbinit' file (if you
-  don't have the source tree), and type these commands:
-    C:\whatever\src> gdb x:\path\to\emacs.exe
-    (gdb) run <ARGUMENTS TO EMACS>
-  Thereafter, use Emacs as usual; you can minimize the debugger
-  window, if you like.  The debugger will take control if and when
-  Emacs crashes.
-  Emacs functions implemented in C use a naming convention that reflects
-  their names in lisp.  The names of the C routines are the lisp names
-  prefixed with 'F', and with dashes converted to underscores.  For
-  example, the function call-process is implemented in C by
-  Fcall_process.  Similarly, lisp variables are prefixed with 'V', again
-  with dashes converted to underscores.  These conventions enable you to
-  easily set breakpoints or examine familiar lisp variables by name.
-  Since Emacs data is often in the form of a lisp object, and the
-  Lisp_Object type is difficult to examine manually in a debugger,
-  Emacs provides a helper routine called debug_print that prints out a
-  readable representation of a Lisp_Object.  If you are using GDB,
-  there is a .gdbinit file in the src directory which provides
-  definitions that are useful for examining lisp objects.  Therefore,
-  the following tips are mainly of interest when using MSVC.
-  The output from debug_print is sent to stderr, and to the debugger
-  via the OutputDebugString routine.  The output sent to stderr should
-  be displayed in the console window that was opened when the
-  emacs.exe executable was started.  The output sent to the debugger
-  should be displayed in its "Debug" output window.
-  When you are in the process of debugging Emacs and you would like to
-  examine the contents of a Lisp_Object variable, pop up the QuickWatch
-  window (QuickWatch has an eyeglass symbol on its button in the
-  toolbar).  In the text field at the top of the window, enter
-  debug_print(<variable>) and hit return.  For example, start and run
-  Emacs in the debugger until it is waiting for user input.  Then click
-  on the Break button in the debugger to halt execution.  Emacs should
-  halt in ZwUserGetMessage waiting for an input event.  Use the Call
-  Stack window to select the procedure w32_msp_pump up the call stack
-  (see below for why you have to do this).  Open the QuickWatch window
-  and enter debug_print(Vexec_path).  Evaluating this expression will
-  then print out the contents of the lisp variable exec-path.
-  If QuickWatch reports that the symbol is unknown, then check the call
-  stack in the Call Stack window.  If the selected frame in the call
-  stack is not an Emacs procedure, then the debugger won't recognize
-  Emacs symbols.  Instead, select a frame that is inside an Emacs
-  procedure and try using debug_print again.
-  If QuickWatch invokes debug_print but nothing happens, then check the
-  thread that is selected in the debugger.  If the selected thread is
-  not the last thread to run (the "current" thread), then it cannot be
-  used to execute debug_print.  Use the Debug menu to select the current
-  thread and try using debug_print again.  Note that the debugger halts
-  execution (e.g., due to a breakpoint) in the context of the current
-  thread, so this should only be a problem if you've explicitly switched
-  threads.
-This file is part of GNU Emacs.
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/nt/config.nt b/nt/config.nt
deleted file mode 100644
index aa4a8bc8cf0..00000000000
--- a/nt/config.nt
+++ /dev/null
@@ -1,1847 +0,0 @@
-/* GNU Emacs site configuration template file.
-Copyright (C) 1988, 1993-1994, 2001-2015 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-/* NOTE:
-   *** WARNING This file is no longer being updated ***
-   Please do not remove non-Windows related stuff
-   unless strictly necessary.  Also, before adding anything here
-   consider whether inc/ms-w32.h would be a better place; this is
-   particularly true for gcc vs. MSVC conditional defines, MinGW or
-   MSVC specific code, and macros not already defined in config.in.  */
-/* No code in Emacs #includes config.h twice, but some bits of code
-   intended to work with other packages as well (like gmalloc.c)
-   think they can include it as many times as they like.  */
-#ifndef EMACS_CONFIG_H
-#define EMACS_CONFIG_H
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-/* Define to use the convention that & in the full name stands for the login
-   id. */
-#undef AMPERSAND_FULL_NAME
-/* Define to the number of bits in type 'ptrdiff_t'. */
-#undef BITSIZEOF_PTRDIFF_T
-/* Define to the number of bits in type 'sig_atomic_t'. */
-#undef BITSIZEOF_SIG_ATOMIC_T
-/* Define to the number of bits in type 'size_t'. */
-#undef BITSIZEOF_SIZE_T
-/* Define to the number of bits in type 'wchar_t'. */
-#undef BITSIZEOF_WCHAR_T
-/* Define to the number of bits in type 'wint_t'. */
-#undef BITSIZEOF_WINT_T
-/* Define if get_current_dir_name should not be used. */
-#undef BROKEN_GET_CURRENT_DIR_NAME
-/* Define on FreeBSD to work around an issue when reading from a PTY. */
-#undef BROKEN_PTY_READ_AFTER_EAGAIN
-/* Define if Emacs cannot be dumped on your system. */
-#undef CANNOT_DUMP
-/* Define this to enable compile time checks for the Lisp_Object data type. */
-/* #undef CHECK_LISP_OBJECT_TYPE */
-/* Define if you want lock files to be written, so that Emacs can tell
-   instantly when you try to modify a file that someone else has modified in
-   his/her Emacs. */
-#define CLASH_DETECTION 1
-/* Short copyright string for this version of Emacs. */
-#define COPYRIGHT "Copyright (C) 2015 Free Software Foundation, Inc."
-/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for 'alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-/* Define if the system is Cygwin. */
-#undef CYGWIN
-/* Define to 1 if using 'alloca.c'. */
-#undef C_ALLOCA
-/* Define if the system is Darwin. */
-#undef DARWIN_OS
-/* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */
-#undef DATA_SEG_BITS
-/* Name of the default sound device. */
-#undef DEFAULT_SOUND_DEVICE
-/* Character that separates a device in a file name. */
-#define DEVICE_SEP ':'
-/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
-#undef DGUX
-/* Character that separates directories in a file name. */
-#define DIRECTORY_SEP '/'
-/* Define if process.c does not need to close a pty to make it a controlling
-   terminal (it is already a controlling terminal of the subprocess, because
-   we did ioctl TIOCSCTTY). */
-#undef DONT_REOPEN_PTY
-/* Define if the system is MS DOS or MS Windows. */
-#define DOS_NT
-/* Define to 1 if you are using the GNU C Library. */
-#undef DOUG_LEA_MALLOC
-/* Define to the canonical Emacs configuration name. */
-#undef EMACS_CONFIGURATION
-/* Define to the options passed to configure. */
-#undef EMACS_CONFIG_OPTIONS
-/* Define to 1 if expensive run-time data type and consistency checks are
-   enabled. */
-#undef ENABLE_CHECKING
-/* Letter to use in finding device name of first PTY, if PTYs are supported.
-   */
-#define FIRST_PTY_LETTER 'a'
-/* Enable compile-time and run-time bounds-checking, and some warnings,
-      without upsetting glibc 2.15+. */
-   #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
-   # define _FORTIFY_SOURCE 2
-   #endif
-/* Define to 1 if futimesat mishandles a NULL file name. */
-#undef FUTIMESAT_NULL_BUG
-/* Define this to check for errors in cons list. */
-#undef GC_CHECK_CONS_LIST
-/* Define this temporarily to hunt a bug. If defined, the size of strings is
-   redundantly recorded in sdata structures so that it can be compared to the
-   sizes recorded in Lisp strings. */
-#undef GC_CHECK_STRING_BYTES
-/* Define this to check the string free list. */
-#undef GC_CHECK_STRING_FREE_LIST
-/* Define this to check for short string overrun. */
-#undef GC_CHECK_STRING_OVERRUN
-/* Mark a secondary stack, like the register stack on the ia64. */
-#undef GC_MARK_SECONDARY_STACK
-/* Define if setjmp is known to save all registers relevant for conservative
-   garbage collection in the jmp_buf.
-   MSVC ignores the "register" keyword, so test fails even though
-   setjmp does work.  */
-#define GC_SETJMP_WORKS 1
-/* Define to the type of elements in the array set by `getgroups'. Usually
-   this is either `int' or `gid_t'. */
-#undef GETGROUPS_T
-/* Define this to 1 if getgroups(0,NULL) does not return the number of groups.
-   */
-#undef GETGROUPS_ZERO_BUG
-/* Define if gettimeofday clobbers the localtime buffer. */
-#undef GETTIMEOFDAY_CLOBBERS_LOCALTIME
-/* Define this to 'void' or 'struct timezone' to match the system's
-   declaration of the second argument to gettimeofday. */
-#undef GETTIMEOFDAY_TIMEZONE
-/* Define this to enable glyphs debugging code. */
-/* #undef GLYPH_DEBUG */
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module close-stream shall be considered present. */
-#undef GNULIB_CLOSE_STREAM
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module faccessat shall be considered present. */
-#undef GNULIB_FACCESSAT
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module fdopendir shall be considered present. */
-#undef GNULIB_FDOPENDIR
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module fscanf shall be considered present. */
-#undef GNULIB_FSCANF
-/* enable some gnulib portability checks */
-#undef GNULIB_PORTCHECK
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module scanf shall be considered present. */
-#undef GNULIB_SCANF
-/* Define if ths system is compatible with GNU/Linux. */
-#undef GNU_LINUX
-/* Define to 1 if you want to use the GNU memory allocator. */
-#define GNU_MALLOC 1
-/* Define to set the G_SLICE environment variable to "always-malloc" at
-   startup, if using GTK. */
-#undef G_SLICE_ALWAYS_MALLOC
-/* Define to 1 if you have the `access' function. */
-#undef HAVE_ACCESS
-/* Define to 1 if you have the `aclsort' function. */
-#undef HAVE_ACLSORT
-/* Define to 1 if you have the <aclv.h> header file. */
-#undef HAVE_ACLV_H
-/* Define to 1 if you have the `aclx_get' function. */
-#undef HAVE_ACLX_GET
-/* Define to 1 if you have the `acl_copy_ext_native' function. */
-#undef HAVE_ACL_COPY_EXT_NATIVE
-/* Define to 1 if you have the `acl_create_entry_np' function. */
-#undef HAVE_ACL_CREATE_ENTRY_NP
-/* Define to 1 if you have the `acl_delete_def_file' function. */
-#undef HAVE_ACL_DELETE_DEF_FILE
-/* Define to 1 if you have the `acl_delete_fd_np' function. */
-#undef HAVE_ACL_DELETE_FD_NP
-/* Define to 1 if you have the `acl_delete_file_np' function. */
-#undef HAVE_ACL_DELETE_FILE_NP
-/* Define to 1 if you have the `acl_entries' function. */
-#undef HAVE_ACL_ENTRIES
-/* Define to 1 if you have the `acl_extended_file' function. */
-#undef HAVE_ACL_EXTENDED_FILE
-/* Define to 1 if the constant ACL_FIRST_ENTRY exists. */
-#undef HAVE_ACL_FIRST_ENTRY
-/* Define to 1 if you have the `acl_free' function. */
-#define HAVE_ACL_FREE 1
-/* Define to 1 if you have the `acl_free_text' function. */
-#undef HAVE_ACL_FREE_TEXT
-/* Define to 1 if you have the `acl_from_mode' function. */
-#undef HAVE_ACL_FROM_MODE
-/* Define to 1 if you have the `acl_from_text' function. */
-#define HAVE_ACL_FROM_TEXT 1
-/* Define to 1 if you have the `acl_get_fd' function. */
-#undef HAVE_ACL_GET_FD
-/* Define to 1 if you have the `acl_get_file' function. */
-#define HAVE_ACL_GET_FILE 1
-/* Define to 1 if you have the <acl/libacl.h> header file. */
-#undef HAVE_ACL_LIBACL_H
-/* Define to 1 if you have the `acl_set_fd' function. */
-#undef HAVE_ACL_SET_FD
-/* Define to 1 if you have the `acl_set_file' function. */
-#define HAVE_ACL_SET_FILE 1
-/* Define to 1 if you have the `acl_to_short_text' function. */
-#undef HAVE_ACL_TO_SHORT_TEXT
-/* Define to 1 if you have the `acl_trivial' function. */
-#undef HAVE_ACL_TRIVIAL
-/* Define to 1 if the ACL type ACL_TYPE_EXTENDED exists. */
-#undef HAVE_ACL_TYPE_EXTENDED
-/* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */
-#undef HAVE_AIX_SMT_EXP
-/* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
-   may be supplied by this distribution. */
-#undef HAVE_ALLOCA
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-/* Define to 1 if ALSA is available. */
-#undef HAVE_ALSA
-/* Define to 1 if strtold conforms to C99. */
-#undef HAVE_C99_STRTOLD
-/* Define to 1 if you have the `cfmakeraw' function. */
-#undef HAVE_CFMAKERAW
-/* Define to 1 if you have the `cfsetspeed' function. */
-#undef HAVE_CFSETSPEED
-/* Define to 1 if you have the `clock_gettime' function. */
-#undef HAVE_CLOCK_GETTIME
-/* Define to 1 if you have the `clock_settime' function. */
-#undef HAVE_CLOCK_SETTIME
-/* Define to 1 if you have the <coff.h> header file. */
-#undef HAVE_COFF_H
-/* Define to 1 if you have the <com_err.h> header file. */
-#undef HAVE_COM_ERR_H
-/* Define to 1 if you have the `copysign' function. */
-#define HAVE_COPYSIGN 1
-/* Define to 1 if data_start is the address of the start of the main data
-   segment. */
-#undef HAVE_DATA_START
-/* Define to 1 if using D-Bus. */
-#undef HAVE_DBUS
-/* Define to 1 if you have the `dbus_type_is_valid' function. */
-#undef HAVE_DBUS_TYPE_IS_VALID
-/* Define to 1 if you have the `dbus_validate_bus_name' function. */
-#undef HAVE_DBUS_VALIDATE_BUS_NAME
-/* Define to 1 if you have the `dbus_validate_interface' function. */
-#undef HAVE_DBUS_VALIDATE_INTERFACE
-/* Define to 1 if you have the `dbus_validate_member' function. */
-#undef HAVE_DBUS_VALIDATE_MEMBER
-/* Define to 1 if you have the `dbus_validate_path' function. */
-#undef HAVE_DBUS_VALIDATE_PATH
-/* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */
-#undef HAVE_DBUS_WATCH_GET_UNIX_FD
-/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't.
-   */
-#undef HAVE_DECL_ALARM
-/* Define to 1 if you have the declaration of `fdatasync', and to 0 if you
-   don't. */
-#undef HAVE_DECL_FDATASYNC
-/* Define to 1 if you have the declaration of `fdopendir', and to 0 if you
-   don't. */
-#undef HAVE_DECL_FDOPENDIR
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-   */
-#define HAVE_DECL_GETENV 1
-/* Define to 1 if you have the declaration of `localtime_r', and to 0 if you
-   don't. */
-#undef HAVE_DECL_LOCALTIME_R
-/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
-   don't. */
-#undef HAVE_DECL_MEMRCHR
-/* Define to 1 if you have the declaration of `strmode', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRMODE
-/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRTOIMAX
-/* Define to 1 if you have the declaration of `strtoll', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRTOLL 1
-/* Define to 1 if you have the declaration of `strtoull', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRTOULL 1
-/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRTOUMAX 1
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_SIGLIST
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-   */
-#define HAVE_DECL_TZNAME 1
-/* Define to 1 if you have the declaration of `unsetenv', and to 0 if you
-   don't. */
-#undef HAVE_DECL_UNSETENV
-/* Define to 1 if you have the declaration of `_putenv', and to 0 if you
-   don't. */
-#undef HAVE_DECL__PUTENV
-/* Define to 1 if you have the declaration of `__fpending', and to 0 if you
-   don't. */
-#undef HAVE_DECL___FPENDING
-/* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
-   don't. */
-#undef HAVE_DECL___SYS_SIGLIST
-/* Define to 1 if you have the <des.h> header file. */
-#undef HAVE_DES_H
-/* Define to 1 if dynamic ptys are supported. */
-#undef HAVE_DEV_PTMX
-/* Define to 1 if you have the `difftime' function. */
-#undef HAVE_DIFFTIME
-/* Define to 1 if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
-/* Define to 1 if you have the 'dup2' function. */
-#define HAVE_DUP2 1
-/* Define to 1 if you have the `eaccess' function. */
-#undef HAVE_EACCESS
-/* Define to 1 if you have the `endgrent' function. */
-#undef HAVE_ENDGRENT
-/* Define to 1 if you have the `endpwent' function. */
-#undef HAVE_ENDPWENT
-/* Define if you have the declaration of environ. */
-#undef HAVE_ENVIRON_DECL
-/* Define to 1 if you have the `euidaccess' function. */
-#undef HAVE_EUIDACCESS
-/* Define to 1 if you have the <execinfo.h> header file. */
-#define HAVE_EXECINFO_H 1
-/* Define to 1 if you have the `faccessat' function. */
-#undef HAVE_FACCESSAT
-/* Define to 1 if you have the `facl' function. */
-#undef HAVE_FACL
-/* Define to 1 if you have the `fdatasync' function. */
-#undef HAVE_FDATASYNC
-/* Define to 1 if you have the `fdopendir' function. */
-#undef HAVE_FDOPENDIR
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-/* Define to 1 if you have the `freeifaddrs' function. */
-#undef HAVE_FREEIFADDRS
-/* Define to 1 if using the freetype and fontconfig libraries. */
-#undef HAVE_FREETYPE
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#undef HAVE_FSEEKO
-/* Define to 1 if you have the `fstatat' function. */
-#undef HAVE_FSTATAT
-/* Define to 1 if you have the `fsync' function. */
-#define HAVE_FSYNC 1
-/* Define to 1 if you have the `futimens' function. */
-#undef HAVE_FUTIMENS
-/* Define to 1 if you have the `futimes' function. */
-#undef HAVE_FUTIMES
-/* Define to 1 if you have the `futimesat' function. */
-#undef HAVE_FUTIMESAT
-/* Define to 1 if you have the `gai_strerror' function. */
-#undef HAVE_GAI_STRERROR
-/* Define to 1 if using GConf. */
-#undef HAVE_GCONF
-/* Define to 1 if you have the `getacl' function. */
-#undef HAVE_GETACL
-/* Define to 1 if you have the `getaddrinfo' function. */
-#undef HAVE_GETADDRINFO
-/* Define to 1 if you have the `getdelim' function. */
-#undef HAVE_GETDELIM
-/* Define to 1 if you have the `getgrent' function. */
-#undef HAVE_GETGRENT
-/* Define to 1 if your system has a working `getgroups' function. */
-#undef HAVE_GETGROUPS
-/* Define to 1 if you have the `gethostname' function. */
-#define HAVE_GETHOSTNAME 1
-/* Define to 1 if you have the `getifaddrs' function. */
-#undef HAVE_GETIFADDRS
-/* Define to 1 if you have the `getline' function. */
-#undef HAVE_GETLINE
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-/* Define to 1 if you have the `getopt_long_only' function. */
-#undef HAVE_GETOPT_LONG_ONLY
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-/* Define to 1 if you have the `getpeername' function. */
-#define HAVE_GETPEERNAME 1
-/* Define to 1 if you have the `getpt' function. */
-#undef HAVE_GETPT
-/* Define to 1 if you have the `getpwent' function. */
-#undef HAVE_GETPWENT
-/* Define to 1 if you have the `getrlimit' function. */
-#undef HAVE_GETRLIMIT
-/* Define to 1 if you have the `getrusage' function. */
-#undef HAVE_GETRUSAGE
-/* Define to 1 if you have the `getsockname' function. */
-#define HAVE_GETSOCKNAME 1
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-/* Define to 1 if using GFile. */
-#undef HAVE_GFILENOTIFY
-/* Define to 1 if you have the `get_current_dir_name' function. */
-#undef HAVE_GET_CURRENT_DIR_NAME
-/* Define to 1 if you have a gif (or ungif) library. */
-#undef HAVE_GIF
-/* Define if using GnuTLS. */
-#undef HAVE_GNUTLS
-/* Define if using GnuTLS certificate verification callbacks. */
-#undef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY
-/* Define to 1 if you have the `gnutls_certificate_set_verify_function'
-   function. */
-#undef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION
-/* Define to 1 if you have the gpm library (-lgpm). */
-#undef HAVE_GPM
-/* Define to 1 if you have the `grantpt' function. */
-#undef HAVE_GRANTPT
-/* Define to 1 if using GSettings. */
-#undef HAVE_GSETTINGS
-/* Define to 1 if using GTK 3 or later. */
-#undef HAVE_GTK3
-/* Define to 1 if you have the `gtk_adjustment_get_page_size' function. */
-#undef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE
-/* Define to 1 if you have the `gtk_dialog_get_action_area' function. */
-#undef HAVE_GTK_DIALOG_GET_ACTION_AREA
-/* Define to 1 if you have the `gtk_file_selection_new' function. */
-#undef HAVE_GTK_FILE_SELECTION_NEW
-/* Define to 1 if you have the `gtk_handle_box_new' function. */
-#undef HAVE_GTK_HANDLE_BOX_NEW
-/* Define to 1 if you have the `gtk_main' function. */
-#undef HAVE_GTK_MAIN
-/* Define to 1 if you have the `gtk_orientable_set_orientation' function. */
-#undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION
-/* Define to 1 if you have the `gtk_tearoff_menu_item_new' function. */
-#undef HAVE_GTK_TEAROFF_MENU_ITEM_NEW
-/* Define to 1 if you have the `gtk_widget_get_mapped' function. */
-#undef HAVE_GTK_WIDGET_GET_MAPPED
-/* Define to 1 if you have the `gtk_widget_get_sensitive' function. */
-#undef HAVE_GTK_WIDGET_GET_SENSITIVE
-/* Define to 1 if you have the `gtk_widget_get_window' function. */
-#undef HAVE_GTK_WIDGET_GET_WINDOW
-/* Define to 1 if you have the `gtk_widget_set_has_window' function. */
-#undef HAVE_GTK_WIDGET_SET_HAS_WINDOW
-/* Define to 1 if you have the `gtk_window_set_has_resize_grip' function. */
-#undef HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP
-/* Define to 1 if you have the `g_type_init' function. */
-#undef HAVE_G_TYPE_INIT
-/* Define to 1 if netdb.h declares h_errno. */
-#define HAVE_H_ERRNO 1
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-#undef HAVE_IFADDRS_H
-/* Define to 1 if using imagemagick. */
-#undef HAVE_IMAGEMAGICK
-/* Define to 1 if you have inet sockets. */
-#define HAVE_INET_SOCKETS 1
-/* Define to 1 to use inotify. */
-#undef HAVE_INOTIFY
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the jpeg library (-ljpeg). */
-#undef HAVE_JPEG
-/* Define to 1 if you have the <kerberosIV/des.h> header file. */
-#undef HAVE_KERBEROSIV_DES_H
-/* Define to 1 if you have the <kerberosIV/krb.h> header file. */
-#undef HAVE_KERBEROSIV_KRB_H
-/* Define to 1 if you have the <kerberos/des.h> header file. */
-#undef HAVE_KERBEROS_DES_H
-/* Define to 1 if you have the <kerberos/krb.h> header file. */
-#undef HAVE_KERBEROS_KRB_H
-/* Define to 1 if `e_text' is a member of `krb5_error'. */
-#undef HAVE_KRB5_ERROR_E_TEXT
-/* Define to 1 if `text' is a member of `krb5_error'. */
-#undef HAVE_KRB5_ERROR_TEXT
-/* Define to 1 if you have the <krb5.h> header file. */
-#undef HAVE_KRB5_H
-/* Define to 1 if you have the <krb.h> header file. */
-#undef HAVE_KRB_H
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-/* Define to 1 if you have the `com_err' library (-lcom_err). */
-#undef HAVE_LIBCOM_ERR
-/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
-/* Define to 1 if you have the `des' library (-ldes). */
-#undef HAVE_LIBDES
-/* Define to 1 if you have the `des425' library (-ldes425). */
-#undef HAVE_LIBDES425
-/* Define to 1 if you have the `dgc' library (-ldgc). */
-#undef HAVE_LIBDGC
-/* Define to 1 if you have the `dnet' library (-ldnet). */
-#undef HAVE_LIBDNET
-/* Define to 1 if you have the <libgen.h> header file. */
-#undef HAVE_LIBGEN_H
-/* Define to 1 if you have the hesiod library (-lhesiod). */
-#undef HAVE_LIBHESIOD
-/* Define to 1 if you have the `k5crypto' library (-lk5crypto). */
-#undef HAVE_LIBK5CRYPTO
-/* Define to 1 if you have the `krb' library (-lkrb). */
-#undef HAVE_LIBKRB
-/* Define to 1 if you have the `krb4' library (-lkrb4). */
-#undef HAVE_LIBKRB4
-/* Define to 1 if you have the `krb5' library (-lkrb5). */
-#undef HAVE_LIBKRB5
-/* Define to 1 if you have the `kstat' library (-lkstat). */
-#undef HAVE_LIBKSTAT
-/* Define to 1 if you have the `lockfile' library (-llockfile). */
-#undef HAVE_LIBLOCKFILE
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-/* Define to 1 if you have the `mail' library (-lmail). */
-#undef HAVE_LIBMAIL
-/* Define to 1 if using libotf. */
-#undef HAVE_LIBOTF
-/* Define to 1 if you have the `perfstat' library (-lperfstat). */
-#undef HAVE_LIBPERFSTAT
-/* Define to 1 if you have the <libpng/png.h> header file. */
-#undef HAVE_LIBPNG_PNG_H
-/* Define to 1 if you have the `pthreads' library (-lpthreads). */
-#undef HAVE_LIBPTHREADS
-/* Define to 1 if you have the resolv library (-lresolv). */
-#undef HAVE_LIBRESOLV
-/* Define to 1 if using SELinux. */
-#undef HAVE_LIBSELINUX
-/* Define to 1 if you have the `Xext' library (-lXext). */
-#undef HAVE_LIBXEXT
-/* Define to 1 if you have the libxml library (-lxml2). */
-#undef HAVE_LIBXML2
-/* Define to 1 if you have the `Xmu' library (-lXmu). */
-#undef HAVE_LIBXMU
-/* Define to 1 if you have the <linux/version.h> header file. */
-#undef HAVE_LINUX_VERSION_H
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-/* Define to 1 if you support file names longer than 14 characters. */
-#define HAVE_LONG_FILE_NAMES 1
-/* Define to 1 if the system has the type 'long long int'. */
-#undef HAVE_LONG_LONG_INT
-/* Define to 1 if you have the `lrand48' function. */
-#undef HAVE_LRAND48
-/* Define to 1 if you have the `lstat' function. */
-#undef HAVE_LSTAT
-/* Define to 1 if you have the `lutimes' function. */
-#undef HAVE_LUTIMES
-/* Define to 1 if using libm17n-flt. */
-#undef HAVE_M17N_FLT
-/* Define to 1 if you have the <machine/soundcard.h> header file. */
-#undef HAVE_MACHINE_SOUNDCARD_H
-/* Define to 1 if you have the <mach/mach.h> header file. */
-#undef HAVE_MACH_MACH_H
-/* Define to 1 if you have the `MagickExportImagePixels' function. */
-#undef HAVE_MAGICKEXPORTIMAGEPIXELS
-/* Define to 1 if you have the `MagickMergeImageLayers' function. */
-#undef HAVE_MAGICKMERGEIMAGELAYERS
-/* Define to 1 if you have the <maillock.h> header file. */
-#undef HAVE_MAILLOCK_H
-/* Define to 1 if you have the <malloc/malloc.h> header file. */
-#undef HAVE_MALLOC_MALLOC_H
-/* Define to 1 if <wchar.h> declares mbstate_t. */
-#undef HAVE_MBSTATE_T
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-/* Define to 1 if you have the `memrchr' function. */
-#undef HAVE_MEMRCHR
-/* Define to 1 if you have mouse menus. (This is automatic if you use X, but
-   the option to specify it remains.) It is also defined with other window
-   systems that support xmenu.c. */
-#undef HAVE_MENUS
-/* Define to 1 if you have the `mkostemp' function. */
-#define HAVE_MKOSTEMP 1
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-/* Define to 1 if you have the `nanotime' function. */
-#undef HAVE_NANOTIME
-/* Define to 1 if you have the <net/if_dl.h> header file. */
-#undef HAVE_NET_IF_DL_H
-/* Define to 1 if you have the <net/if.h> header file. */
-#undef HAVE_NET_IF_H
-/* Define to 1 if you have the <nlist.h> header file. */
-#undef HAVE_NLIST_H
-/* Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on
-   Mac OS X. */
-#undef HAVE_NS
-/* Define to use native MS Windows GUI. */
-#define HAVE_NTGUI 1
-/* Define to 1 if libotf has OTF_get_variation_glyphs. */
-#undef HAVE_OTF_GET_VARIATION_GLYPHS
-/* Define to 1 if personality LINUX32 can be set. */
-#undef HAVE_PERSONALITY_LINUX32
-/* Define to 1 if you have the png library (-lpng). */
-#undef HAVE_PNG
-/* Define to 1 if you have the <png.h> header file. */
-#undef HAVE_PNG_H
-/* Define to 1 if you have the `posix_memalign' function. */
-#undef HAVE_POSIX_MEMALIGN
-/* Define to 1 if you have the `posix_openpt' function. */
-#undef HAVE_POSIX_OPENPT
-/* Define if you have the /proc filesystem. */
-#undef HAVE_PROCFS
-/* Define to 1 if you have the `pselect' function. */
-#undef HAVE_PSELECT
-/* Define to 1 if you have the `pstat_getdynamic' function. */
-#undef HAVE_PSTAT_GETDYNAMIC
-/* Define to 1 if you have pthread (-lpthread). */
-#undef HAVE_PTHREAD
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
-/* Define to 1 if the pthread_sigmask function can be used (despite bugs). */
-#undef HAVE_PTHREAD_SIGMASK
-/* Define if the system supports pty devices. */
-#undef HAVE_PTYS
-/* Define to 1 if you have the <pty.h> header file. */
-#undef HAVE_PTY_H
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-/* Define to 1 if you have the `random' function. */
-#define HAVE_RANDOM 1
-/* Define to 1 if you have the `readlink' function. */
-#undef HAVE_READLINK
-/* Define to 1 if you have the `readlinkat' function. */
-#undef HAVE_READLINKAT
-/* Define to 1 if you have the `recvfrom' function. */
-#define HAVE_RECVFROM 1
-/* Define to 1 if res_init is available. */
-#undef HAVE_RES_INIT
-/* Define to 1 if you have the `rint' function. */
-#undef HAVE_RINT
-/* Define to 1 if using librsvg. */
-#undef HAVE_RSVG
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-/* Define to 1 if you have the `sendto' function. */
-#define HAVE_SENDTO 1
-/* Define to 1 if you have the `setitimer' function. */
-#define HAVE_SETITIMER 1
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-/* Define to 1 if you have the `setrlimit' function. */
-#undef HAVE_SETRLIMIT
-/* Define to 1 if you have the `shutdown' function. */
-#define HAVE_SHUTDOWN 1
-/* Define to 1 if you have the `sig2str' function. */
-#undef HAVE_SIG2STR
-/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
-#undef HAVE_SIGNED_SIG_ATOMIC_T
-/* Define to 1 if 'wchar_t' is a signed integer type. */
-#undef HAVE_SIGNED_WCHAR_T
-/* Define to 1 if 'wint_t' is a signed integer type. */
-#undef HAVE_SIGNED_WINT_T
-/* Define to 1 if sigsetjmp and siglongjmp work. The value of this symbol is
-   irrelevant if HAVE__SETJMP is defined. */
-#undef HAVE_SIGSETJMP
-/* Define to 1 if the system has the type `sigset_t'. */
-#undef HAVE_SIGSET_T
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-/* Define if the system supports 4.2-compatible sockets.
-   NT supports Winsock which is close enough (with some hacks).  */
-#define HAVE_SOCKETS 1
-/* Define to 1 if you have sound support. */
-#define HAVE_SOUND 1
-/* Define to 1 if you have the <soundcard.h> header file. */
-#undef HAVE_SOUNDCARD_H
-/* Define to 1 if `speed_t' is declared by <termios.h>. */
-#undef HAVE_SPEED_T
-/* Define to 1 if you have the `statacl' function. */
-#undef HAVE_STATACL
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-/* Define to 1 if you have the <stdio_ext.h> header file. */
-#undef HAVE_STDIO_EXT_H
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-/* Define to 1 if you have the `strsignal' function. */
-#undef HAVE_STRSIGNAL
-/* Define to 1 if you have the `strtoimax' function. */
-#undef HAVE_STRTOIMAX
-/* Define to 1 if you have the `strtoll' function. */
-#undef HAVE_STRTOLL
-/* Define to 1 if you have the `strtoull' function. */
-#define HAVE_STRTOULL 1
-/* Define to 1 if you have the `strtoumax' function. */
-#define HAVE_STRTOUMAX 1
-/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */
-#undef HAVE_STRUCT_IFREQ_IFR_ADDR
-/* Define to 1 if `ifr_addr.sa_len' is a member of `struct ifreq'. */
-#undef HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN
-/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */
-#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
-/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */
-#undef HAVE_STRUCT_IFREQ_IFR_FLAGS
-/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
-#undef HAVE_STRUCT_IFREQ_IFR_HWADDR
-/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */
-#undef HAVE_STRUCT_IFREQ_IFR_NETMASK
-/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */
-#undef HAVE_STRUCT_NLIST_N_UN_N_NAME
-/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_ATIMENSEC
-/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
-/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC
-/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
-/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
-/* Define to 1 if `st_birthtimespec.tv_nsec' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
-/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
-#undef HAVE_STRUCT_TM_TM_ZONE
-/* Define if struct utimbuf is declared -- usually in <utime.h>. Some systems
-   have utime.h but don't declare the struct anywhere. */
-#undef HAVE_STRUCT_UTIMBUF
-/* Define if struct stat has an st_dm_mode member. */
-#undef HAVE_ST_DM_MODE
-/* Define to 1 if you have the `symlink' function. */
-#undef HAVE_SYMLINK
-/* Define to 1 if you have the `sync' function. */
-#undef HAVE_SYNC
-/* Define to 1 if you have the <sys/acl.h> header file. */
-#define HAVE_SYS_ACL_H 1
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-#undef HAVE_SYS_INOTIFY_H
-/* Define to 1 if you have the <sys/inttypes.h> header file. */
-#undef HAVE_SYS_INTTYPES_H
-/* Define to 1 if you have the <sys/loadavg.h> header file. */
-#undef HAVE_SYS_LOADAVG_H
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-/* Define to 1 if you have the <sys/soundcard.h> header file. */
-#undef HAVE_SYS_SOUNDCARD_H
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-/* Define to 1 if you have the <sys/systeminfo.h> header file. */
-#undef HAVE_SYS_SYSTEMINFO_H
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#define HAVE_SYS_TIMEB_H 1
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-/* Define to 1 if you have the <sys/un.h> header file. */
-#undef HAVE_SYS_UN_H
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#undef HAVE_SYS_UTSNAME_H
-/* Define to 1 if you have the <sys/vlimit.h> header file. */
-#undef HAVE_SYS_VLIMIT_H
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-/* Define to 1 if you have the <term.h> header file. */
-#undef HAVE_TERM_H
-/* Define to 1 if you have the tiff library (-ltiff). */
-#undef HAVE_TIFF
-/* Define to 1 if you have the `timer_settime' function. */
-#undef HAVE_TIMER_SETTIME
-/* Define if struct tm has the tm_gmtoff member. */
-#undef HAVE_TM_GMTOFF
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#undef HAVE_TM_ZONE
-/* Define to 1 if you have the `touchlock' function. */
-#undef HAVE_TOUCHLOCK
-/* Define to 1 if you don't have `tm_zone' but do have the external array
-   `tzname'. */
-#define HAVE_TZNAME 1
-/* Define to 1 if you have the `tzset' function. */
-#define HAVE_TZSET 1
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-/* Define to 1 if you have the `unsetenv' function. */
-#define HAVE_UNSETENV 1
-/* Define to 1 if the system has the type 'unsigned long long int'. */
-#undef HAVE_UNSIGNED_LONG_LONG_INT
-/* Define to 1 if you have the <util.h> header file. */
-#undef HAVE_UTIL_H
-/* Define to 1 if you have the `utimensat' function. */
-#undef HAVE_UTIMENSAT
-/* Define to 1 if you have the `utimes' function. */
-#undef HAVE_UTIMES
-/* Define to 1 if you have the <utime.h> header file. */
-#undef HAVE_UTIME_H
-/* Define to 1 if you have the <utmp.h> header file. */
-#undef HAVE_UTMP_H
-/* Define to 1 if you have the `vfork' function. */
-#undef HAVE_VFORK
-/* Define to 1 if you have the <vfork.h> header file. */
-#undef HAVE_VFORK_H
-/* Define to 1 to use w32notify. */
-#define HAVE_W32NOTIFY 1
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
-/* Define if you have the 'wchar_t' type. */
-#define HAVE_WCHAR_T 1
-/* Define if you have a window system. */
-#undef HAVE_WINDOW_SYSTEM
-/* Define to 1 if you have the <winsock2.h> header file. */
-#undef HAVE_WINSOCK2_H
-/* Define to 1 if `fork' works. */
-#undef HAVE_WORKING_FORK
-/* Define to 1 if fstatat (..., 0) works. For example, it does not work in AIX
-   7.1. */
-#undef HAVE_WORKING_FSTATAT_ZERO_FLAG
-/* Define if utimes works properly. */
-#undef HAVE_WORKING_UTIMES
-/* Define to 1 if `vfork' works. */
-#undef HAVE_WORKING_VFORK
-/* Define to 1 if you have the <ws2tcpip.h> header file. */
-#undef HAVE_WS2TCPIP_H
-/* Define to 1 if you want to use version 11 of X windows. Otherwise, Emacs
-   expects to use version 10. */
-#undef HAVE_X11
-/* Define to 1 if you have the X11R6 or newer version of Xlib. */
-#undef HAVE_X11R6
-/* Define if you have usable X11R6-style XIM support. */
-#undef HAVE_X11R6_XIM
-/* Define to 1 if you have the X11R6 or newer version of Xt. */
-#undef HAVE_X11XTR6
-/* Define to 1 if you have the Xaw3d library (-lXaw3d). */
-#undef HAVE_XAW3D
-/* Define to 1 if you have the Xft library. */
-#undef HAVE_XFT
-/* Define to 1 if XIM is available */
-#undef HAVE_XIM
-/* Define to 1 if you have the Xinerama extension. */
-#undef HAVE_XINERAMA
-/* Define to 1 if you have the Xkb extension. */
-#undef HAVE_XKB
-/* Define to 1 if you have the Xpm library (-lXpm). */
-#undef HAVE_XPM
-/* Define to 1 if you have the XRandr extension. */
-#undef HAVE_XRANDR
-/* Define to 1 if you have the `XrmSetDatabase' function. */
-#undef HAVE_XRMSETDATABASE
-/* Define to 1 if you have the `XRRGetOutputPrimary' function. */
-#undef HAVE_XRRGETOUTPUTPRIMARY
-/* Define to 1 if you have the `XRRGetScreenResourcesCurrent' function. */
-#undef HAVE_XRRGETSCREENRESOURCESCURRENT
-/* Define to 1 if you have the `XScreenNumberOfScreen' function. */
-#undef HAVE_XSCREENNUMBEROFSCREEN
-/* Define to 1 if you have the `XScreenResourceString' function. */
-#undef HAVE_XSCREENRESOURCESTRING
-/* Define if you have usable i18n support. */
-#undef HAVE_X_I18N
-/* Define to 1 if you have the SM library (-lSM). */
-#undef HAVE_X_SM
-/* Define to 1 if you want to use the X window system. */
-#undef HAVE_X_WINDOWS
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-/* Define to 1 if you have the `_ftime' function. */
-#undef HAVE__FTIME
-/* Define to 1 if _setjmp and _longjmp work.  */
-#define HAVE__SETJMP 1
-/* Define to 1 if you have the `__builtin_unwind_init' function. */
-#undef HAVE___BUILTIN_UNWIND_INIT
-/* Define to 1 if you have the `__executable_start' function. */
-#undef HAVE___EXECUTABLE_START
-/* Define to 1 if you have the `__fpending' function. */
-#undef HAVE___FPENDING
-/* Define to support using a Hesiod database to find the POP server. */
-#undef HESIOD
-/* Define if the system is HPUX. */
-#undef HPUX
-/* This is substituted when $TERM is "internal". */
-#undef INTERNAL_TERMINAL
-/* Define to read input using SIGIO. */
-#undef INTERRUPT_INPUT
-/* Define if the system is IRIX. */
-#undef IRIX6_5
-/* Returns true if character is any form of separator. */
-#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
-/* Returns true if character is a device separator. */
-#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
-/* Returns true if character is a directory separator. */
-#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\')
-/* Define to support Kerberos-authenticated POP mail retrieval. */
-#undef KERBEROS
-/* Define to use Kerberos 5 instead of Kerberos 4. */
-#undef KERBEROS5
-/* Define to 1 if localtime caches TZ. */
-#define LOCALTIME_CACHE 1
-/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing
-   slash. */
-#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-/* String giving fallback POP mail host. */
-#undef MAILHOST
-/* Define to unlink, rather than empty, mail spool after reading. */
-#undef MAIL_UNLINK_SPOOL
-/* Define if the mailer uses flock to interlock the mail spool. */
-#undef MAIL_USE_FLOCK
-/* Define if the mailer uses lockf to interlock the mail spool. */
-#undef MAIL_USE_LOCKF
-/* Define to support MMDF mailboxes in movemail. */
-#undef MAIL_USE_MMDF
-/* Define to support POP mail retrieval. */
-#define MAIL_USE_POP 1
-/* Define if the system is MS DOS. */
-#undef MSDOS
-/* Define if system's imake configuration file defines `NeedWidePrototypes' as
-   `NO'. */
-#undef NARROWPROTO
-/* Define if XEditRes should not be used. */
-#undef NO_EDITRES
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-/* Minimum value of NSIG. */
-#undef NSIG_MINIMUM
-/* Define to 1 if `NSInteger' is defined. */
-#undef NS_HAVE_NSINTEGER
-/* Define to 1 if you are using NS windowing under MacOS X. */
-#undef NS_IMPL_COCOA
-/* Define to 1 if you are using NS windowing under GNUstep. */
-#undef NS_IMPL_GNUSTEP
-/* Name of the file to open to get a null file, or a data sink. */
-#define NULL_DEVICE "NUL:"
-/* Define to 1 if the nlist n_name member is a pointer */
-#undef N_NAME_POINTER
-/* Name of package */
-#define PACKAGE "emacs"
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-/* the number of pending output bytes on stream 'fp' */
-#define PENDING_OUTPUT_N_BYTES  (fp->_ptr - fp->_base)
-/* Define to empty to suppress deprecation warnings when building with
-   --enable-gcc-warnings and with libpng versions before 1.5, which lack
-   png_longjmp. */
-#undef PNG_DEPSTRUCT
-/* Define if process_send_signal should use VSUSP instead of VSWTCH. */
-#undef PREFER_VSUSP
-/* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno.
-   */
-#undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO
-/* Define to 1 if pthread_sigmask() may returns 0 and have no effect. */
-#undef PTHREAD_SIGMASK_INEFFECTIVE
-/* Define to 1 if pthread_sigmask() unblocks signals incorrectly. */
-#undef PTHREAD_SIGMASK_UNBLOCK_BUG
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'ptrdiff_t'. */
-#undef PTRDIFF_T_SUFFIX
-/* How to iterate over PTYs. */
-#undef PTY_ITERATION
-/* How to get the device name of the control end of a PTY, if non-standard. */
-#undef PTY_NAME_SPRINTF
-/* How to open a PTY, if non-standard. */
-#undef PTY_OPEN
-/* How to get device name of the tty end of a PTY, if non-standard. */
-#undef PTY_TTY_NAME_SPRINTF
-/* Define to 1 if readlink fails to recognize a trailing slash. */
-#undef READLINK_TRAILING_SLASH_BUG
-/* Define REL_ALLOC if you want to use the relocating allocator for buffer
-   space. */
-#define REL_ALLOC 1
-/* Define to 1 if stat needs help when passed a directory name with a trailing
-   slash */
-#undef REPLACE_FUNC_STAT_DIR
-/* Define to 1 if stat needs help when passed a file name with a trailing
-   slash */
-#undef REPLACE_FUNC_STAT_FILE
-/* Define if emacs.c needs to call run_time_remap; for HPUX. */
-#undef RUN_TIME_REMAP
-/* Character that separates PATH elements. */
-#define SEPCHAR ';'
-/* How to set up a slave PTY, if needed. */
-#undef SETUP_SLAVE_PTY
-/* Make process_send_signal work by "typing" a signal character on the pty. */
-#undef SIGNALS_VIA_CHARACTERS
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'sig_atomic_t'. */
-#undef SIG_ATOMIC_T_SUFFIX
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'size_t'. */
-#undef SIZE_T_SUFFIX
-/* Define if the system is Solaris. */
-#undef SOLARIS2
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-/* Define to 1 on System V Release 4. */
-#undef SVR4
-/* Define to use system malloc. */
-#undef SYSTEM_MALLOC
-/* The type of system you are compiling for; sets `system-type'. */
-#define SYSTEM_TYPE "windows-nt"
-/* Undocumented. */
-#undef TAB3
-/* Undocumented. */
-#undef TABDLY
-/* Define to 1 if you use terminfo instead of termcap. */
-#undef TERMINFO
-/* Define to the header for the built-in window system. */
-#define TERM_HEADER "w32term.h"
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-/* Some platforms redefine this. */
-#undef TIOCSIGSEND
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-/* Define to 1 if the type of the st_atim member of a struct stat is struct
-   timespec. */
-#undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
-/* Define to 1 for Encore UMAX. */
-#undef UMAX
-/* Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h> instead of
-   <sys/cpustats.h>. */
-#undef UMAX4_3
-/* Define if the system has Unix98 PTYs. */
-#undef UNIX98_PTYS
-/* Define to 1 if FIONREAD is usable. */
-#define USABLE_FIONREAD 1
-/* Define to 1 if SIGIO is usable. */
-#undef USABLE_SIGIO
-/* How to get a user's full name. */
-#define USER_FULL_NAME pw->pw_gecos
-/* Define to nonzero if you want access control list support. */
-#undef USE_ACL
-/* Define to 1 if using file notifications. */
-#define USE_FILE_NOTIFY 1
-/* Define to 1 if using GTK. */
-#undef USE_GTK
-/* Define to 1 if using the Lucid X toolkit. */
-#undef USE_LUCID
-/* Define to use mmap to allocate buffer text. */
-#undef USE_MMAP_FOR_BUFFERS
-/* Define to 1 if using the Motif X toolkit. */
-#undef USE_MOTIF
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable general extensions on OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
-   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
-   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-/* Define to 1 if we should use toolkit scroll bars. */
-#define USE_TOOLKIT_SCROLL_BARS 1
-/* Define to 1 if we should use XIM, if it is available. */
-#undef USE_XIM
-/* Define to 1 if using an X toolkit. */
-#undef USE_X_TOOLKIT
-/* Define if the system is compatible with System III. */
-#undef USG
-/* Define if the system is compatible with System V. */
-#undef USG5
-/* Define if the system is compatible with System V Release 4. */
-#undef USG5_4
-/* Define for USG systems where it works to open a pty's tty in the parent
-   process, then close and reopen it in the child. */
-#undef USG_SUBTTY_WORKS
-/* Version number of package */
-#define VERSION "25.0.50"
-/* Define to 1 if unsetenv returns void instead of int. */
-#undef VOID_UNSETENV
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'wchar_t'. */
-#undef WCHAR_T_SUFFIX
-/* Use long long for EMACS_INT if available. */
-/* #undef WIDE_EMACS_INT */
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'wint_t'. */
-#undef WINT_T_SUFFIX
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
-/* Define this to check for malloc buffer overrun. */
-#undef XMALLOC_OVERRUN_CHECK
-/* Compensate for a bug in Xos.h on some systems, where it requires time.h. */
-#undef XOS_NEEDS_TIME_H
-/* Define to the type of the 6th arg of XRegisterIMInstantiateCallback, either
-   XPointer or XPointer*. */
-#undef XRegisterIMInstantiateCallback_arg6
-/* Define if the system is AIX. */
-#undef _AIX
-/* Enable large inode numbers on Mac OS X 10.5. */
-#undef _DARWIN_USE_64_BIT_INODE
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct
-   stat.st_size becomes 64-bit. */
-#undef _GL_WINDOWS_64_BIT_ST_SIZE
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-/* Define if GNUstep uses ObjC exceptions. */
-#undef _NATIVE_OBJC_EXCEPTIONS
-/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
-#undef _NETBSD_SOURCE
-/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__))
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-/* Define to 1 if you need to in order for 'stat' and other things to work. */
-#undef _POSIX_SOURCE
-/* Needed for system_process_attributes on Solaris. */
-#undef _STRUCTURED_PROC
-/* Define to rpl_ if the getopt replacement functions and variables should be
-   used. */
-#undef __GETOPT_PREFIX
-/* Define to compiler's equivalent of C99 restrict keyword in array
-   declarations. Define as empty for no equivalent. */
-#undef __restrict_arr
-/* Some platforms that do not use configure define this to include extra
-   configuration information. */
-#define config_opsysfile <ms-w32.h>
-/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'.
-   _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
-   _GL_INLINE_HEADER_BEGIN contains useful stuff to put
-     in an include file, before uses of _GL_INLINE.
-     It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
-   _GL_INLINE_HEADER_END contains useful stuff to put
-     in the same include file, after uses of _GL_INLINE.
-   Suppress extern inline with HP-UX cc, as it appears to be broken; see
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
-   Suppress extern inline with Sun C in standards-conformance mode, as it
-   mishandles inline functions that call each other.  E.g., for 'inline void f
-   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
-   'reference to static identifier "f" in extern inline function'.
-   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
-   Suppress the use of extern inline on Apple's platforms, as Libc at least
-   through Libc-825.26 (2013-04-09) is incompatible with it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : (199901L <= __STDC_VERSION__ \
-         && !defined __HP_cc \
-         && !(defined __SUNPRO_C && __STDC__))) \
-     && !defined __APPLE__)
-# define _GL_INLINE inline
-# define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
-# if __GNUC_GNU_INLINE__
-   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
-#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
-# else
-#  define _GL_INLINE extern inline
-# endif
-# define _GL_EXTERN_INLINE extern
-#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
-#endif
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
-#  define _GL_INLINE_HEADER_CONST_PRAGMA
-# else
-#  define _GL_INLINE_HEADER_CONST_PRAGMA \
-     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
-# endif
-# define _GL_INLINE_HEADER_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
-    _GL_INLINE_HEADER_CONST_PRAGMA
-# define _GL_INLINE_HEADER_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
-#endif
-/* A replacement for va_copy, if needed.  */
-#define gl_va_copy(a,b) ((a) = (b))
-/* Define to rpl_gmtime if the replacement function should be used. */
-#undef gmtime
-/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
-   __APPLE_CC__ tests for the Apple compiler and its version.
-   __STDC_VERSION__ tests for the C99 mode.  */
-#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-# define __GNUC_STDC_INLINE__ 1
-#endif
-/* Define to 1 if the compiler is checking for lint. */
-#undef lint
-/* Define to rpl_localtime if the replacement function should be used. */
-#undef localtime
-/* Define to a type if <wchar.h> does not define. */
-#undef mbstate_t
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
-/* Define to the name of the strftime replacement function. */
-#define my_strftime nstrftime
-/* Define to the type of st_nlink in struct stat, or a supertype. */
-#define nlink_t short
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
-/* type to use in place of socklen_t if not defined */
-#undef socklen_t
-/* Define as a signed type of the same size as size_t. */
-#undef ssize_t
-/* Define to enable asynchronous subprocesses. */
-#define subprocesses
-/* Define to any substitute for sys_siglist. */
-#undef sys_siglist
-/* Define as a marker that can be attached to declarations that might not
-    be used.  This helps to reduce warnings, such as from
-    GCC -Wunused-parameter.  */
-#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_UNUSED __attribute__ ((__unused__))
-#else
-# define _GL_UNUSED
-#endif
-/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
-   is a misnomer outside of parameter lists.  */
-#define _UNUSED_PARAMETER_ _GL_UNUSED
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
-/* Define as a macro for copying va_list variables. */
-#undef va_copy
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
-#include <conf_post.h>
-#endif /* EMACS_CONFIG_H */
-/*
-Local Variables:
-mode: c
-End:
-*/
diff --git a/nt/configure.bat b/nt/configure.bat
index f6ac8fccc77..629bcc84498 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,6 +1,6 @@
 @echo off
 rem   ----------------------------------------------------------------------
-rem   Configuration script for MS Windows operating systems
+rem   This was the old configuration script for MS Windows operating systems
 rem   Copyright (C) 1999-2015 Free Software Foundation, Inc.
 rem   This file is part of GNU Emacs.
@@ -19,956 +19,8 @@ rem   You should have received a copy of the GNU General Public License
 rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
 rem   ----------------------------------------------------------------------
-rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
-rem
-rem   + MS Windows 95, NT or later
-rem   + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75
-rem     or later) and the Mingw32 and Windows API headers and libraries.
-rem   + Visual Studio 2005 is not supported at this time.
-rem
-rem For reference, here is a list of which builds of GNU make are known to
-rem work or not, and whether they work in the presence and/or absence of
-rem sh.exe.
-rem
-rem                                       sh exists     no sh
-rem  cygwin b20.1 make (3.75):            fails[1,5]    fails[2,5]
-rem  MSVC compiled gmake 3.77:            okay          okay
-rem  MSVC compiled gmake 3.78.1:          okay          okay
-rem  MSVC compiled gmake 3.79.1:          okay          okay
-rem  mingw32/gcc-2.92.2 make (3.77):      okay          okay[4]
-rem  cygwin compiled gmake 3.77:          fails[1,5]    fails[2,5]
-rem  cygwin compiled gmake 3.78.1:        fails[5]      fails[2,5]
-rem  cygwin compiled gmake 3.79.1:        fails[3,5]    fails[2?,5]
-rem  cygwin compiled make 3.80:           okay[6]       fails?[7]
-rem  cygwin compiled make 3.81:           fails         fails?[7]
-rem  mingw32 compiled make 3.79.1:        okay          okay
-rem  mingw32 compiled make 3.80:          okay          okay?[7]
-rem  mingw32 compiled make 3.81:          okay          okay[8]
-rem
-rem [1] doesn't cope with makefiles with DOS line endings, so must mount
-rem     emacs source with text!=binary.
-rem [2] fails when needs to invoke shell commands; okay invoking gcc etc.
-rem [3] requires LC_MESSAGES support to build; cannot build with early
-rem     versions of cygwin.
-rem [4] may fail on Windows 9X and Windows ME; if so, install Bash.
-rem [5] fails when building leim due to the use of cygwin style paths.
-rem     May work if building emacs without leim.
-rem [6] need to uncomment 3 lines in nt/gmake.defs that invoke `cygpath';
-rem     look for "cygpath" near line 85 of gmake.defs.
-rem [7] not recommended; please report if you try this combination.
-rem [8] tested only on Windows XP.
-rem
 echo ****************************************************************
 echo *** THIS METHOD OF BUILDING EMACS IS NO LONGER SUPPORTED.     **
-echo *** INSTEAD, FOLLOW THE INSTRUCTIONS FROM INSTALL.            **
+echo *** INSTEAD, FOLLOW THE INSTRUCTIONS IN THE FILE INSTALL.     **
+echo *** IN THE SAME DIRECTORY AS THIS BATCH FILE.                 **
 echo ****************************************************************
-:confirm_continue
-set /p answer=Continue running this script at your own risks ? (Y/N)
-if x%answer% == xy (goto confirm_continue_y)
-if x%answer% == xY (goto confirm_continue_y)
-if x%answer% == xn (goto end)
-if x%answer% == xN (goto end)
-echo Please answer by Y or N
-goto confirm_continue
-:confirm_continue_y
-if exist config.log del config.log
-rem ----------------------------------------------------------------------
-rem   See if the environment is large enough.  We need 43 (?) bytes.
-set $foo$=123456789_123456789_123456789_123456789_123
-if not "%$foo$%" == "123456789_123456789_123456789_123456789_123" goto SmallEnv
-set $foo$=
-rem ----------------------------------------------------------------------
-rem   Make sure we are running in the nt subdir
-if exist configure.bat goto start
-echo You must run configure from the nt subdirectory.
-goto end
-:start
-rem ----------------------------------------------------------------------
-rem   Attempt to enable command extensions.  Set use_extensions to 1 if
-rem   they are available and 0 if they are not available.
-set use_extensions=1
-setlocal ENABLEEXTENSIONS
-if "%CMDEXTVERSION%" == "" set use_extensions=0
-if "%use_extensions%" == "1" goto afterext
-echo. Command extensions are not available.  Using parameters that include the =
-echo. character by enclosing them in quotes will not be supported.
-:afterext
-rem ----------------------------------------------------------------------
-rem   Default settings.
-set prefix=
-set nodebug=N
-set noopt=N
-set enablechecking=N
-set profile=N
-set nocygwin=N
-set COMPILER=
-set usercflags=
-set escusercflags=
-set docflags=
-set userldflags=
-set escuserldflags=
-set extrauserlibs=
-set doldflags=
-set doextralibs=
-set sep1=
-set sep2=
-set sep3=
-set sep4=
-set distfiles=
-rem ----------------------------------------------------------------------
-rem   Handle arguments.
-:again
-if "%1" == "-h" goto usage
-if "%1" == "--help" goto usage
-if "%1" == "--prefix" goto setprefix
-if "%1" == "--with-gcc" goto withgcc
-if "%1" == "--with-msvc" goto withmsvc
-if "%1" == "--no-debug" goto nodebug
-if "%1" == "--no-opt" goto noopt
-if "%1" == "--enable-checking" goto enablechecking
-if "%1" == "--profile" goto profile
-if "%1" == "--no-cygwin" goto nocygwin
-if "%1" == "--cflags" goto usercflags
-if "%1" == "--ldflags" goto userldflags
-if "%1" == "--lib" goto extrauserlibs
-if "%1" == "--without-png" goto withoutpng
-if "%1" == "--without-jpeg" goto withoutjpeg
-if "%1" == "--without-gif" goto withoutgif
-if "%1" == "--without-tiff" goto withouttiff
-if "%1" == "--without-gnutls" goto withoutgnutls
-if "%1" == "--without-libxml2" goto withoutlibxml2
-if "%1" == "--without-xpm" goto withoutxpm
-if "%1" == "--with-svg" goto withsvg
-if "%1" == "--distfiles" goto distfiles
-if "%1" == "" goto checkutils
-:usage
-echo Usage: configure [options]
-echo Options:
-echo.   --prefix PREFIX         install Emacs in directory PREFIX
-echo.   --with-gcc              use GCC to compile Emacs
-echo.   --with-msvc             use MSVC to compile Emacs
-echo.   --no-debug              exclude debug info from executables
-echo.   --no-opt                disable optimization
-echo.   --enable-checking       enable additional run-time checks
-echo.   --profile               enable profiling
-echo.   --no-cygwin             use -mno-cygwin option with GCC
-echo.   --cflags FLAG           pass FLAG to compiler
-echo.   --ldflags FLAG          pass FLAG to compiler when linking
-echo.   --lib LIB               link to extra library LIB
-echo.   --without-png           do not use PNG library even if it is installed
-echo.   --without-jpeg          do not use JPEG library even if it is installed
-echo.   --without-gif           do not use GIF library even if it is installed
-echo.   --without-tiff          do not use TIFF library even if it is installed
-echo.   --without-xpm           do not use XPM library even if it is installed
-echo.   --without-gnutls        do not use GnuTLS library even if it is installed
-echo.   --without-libxml2       do not use libxml2 library even if it is installed
-echo.   --with-svg              use the RSVG library (experimental)
-echo.   --distfiles             path to files for make dist, e.g. libXpm.dll
-if "%use_extensions%" == "0" goto end
-echo.
-echo. The cflags and ldflags arguments support parameters that include the =
-echo. character.  However, since the = character is normally treated as a
-echo. separator character you will need to enclose any parameter that includes
-echo. the = character in quotes.  For example, to include
-echo. -DSITELOAD_PURESIZE_EXTRA=100000 as one of the cflags you would run
-echo. configure.bat as follows:
-echo. configure.bat --cflags "-DSITELOAD_PURESIZE_EXTRA=100000"
-echo.
-echo. Note that this capability of processing parameters that include the =
-echo. character depends on command extensions.  This batch file attempts to
-echo. enable command extensions.  If command extensions cannot be enabled, a
-echo. warning message will be displayed.
-echo.
-echo. IMPORTANT: This method of building Emacs for MS-Windows is deprecated,
-echo. and could be removed in a future version of Emacs.  The preferred way
-echo  to build Emacs for MS-Windows from now on is using the MSYS environment
-echo. and MinGW development tools.  Please see nt/INSTALL for details.
-goto end
-rem ----------------------------------------------------------------------
-:setprefix
-shift
-set prefix=%1
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withgcc
-set COMPILER=gcc
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withmsvc
-set COMPILER=cl
-shift
-goto again
-rem ----------------------------------------------------------------------
-:nodebug
-set nodebug=Y
-shift
-goto again
-rem ----------------------------------------------------------------------
-:noopt
-set noopt=Y
-shift
-goto again
-rem ----------------------------------------------------------------------
-:enablechecking
-set enablechecking=Y
-shift
-goto again
-rem ----------------------------------------------------------------------
-:profile
-set profile=Y
-shift
-goto again
-rem ----------------------------------------------------------------------
-:nocygwin
-set nocygwin=Y
-shift
-goto again
-rem ----------------------------------------------------------------------
-:usercflags
-if "%use_extensions%" == "1" goto ucflagex
-goto ucflagne
-:ucflagex
-shift
-set usercflags=%usercflags%%sep1%%~1
-set escusercflags=%usercflags:"=\"%
-set sep1= %nothing%
-shift
-goto again
-:ucflagne
-shift
-set usercflags=%usercflags%%sep1%%1
-set escusercflags=%usercflags%
-set sep1= %nothing%
-shift
-goto again
-:extrauserlibs
-shift
-echo. extrauserlibs: %extrauserlibs%
-set extrauserlibs=%extrauserlibs%%sep4%%1
-set sep4= %nothing%
-shift
-goto again
-rem ----------------------------------------------------------------------
-:userldflags
-if "%use_extensions%" == "1" goto ulflagex
-goto ulflagne
-:ulflagex
-shift
-set userldflags=%userldflags%%sep2%%~1
-set escuserldflags=%userldflags:"=\"%
-set sep2= %nothing%
-shift
-goto again
-:ulflagne
-shift
-set userldflags=%userldflags%%sep2%%1
-set escuserldflags=%userldflags%
-set sep2= %nothing%
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withoutpng
-set pngsupport=N
-set HAVE_PNG=
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withoutjpeg
-set jpegsupport=N
-set HAVE_JPEG=
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withoutgif
-set gifsupport=N
-set HAVE_GIF=
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withoutgnutls
-set tlssupport=N
-set HAVE_GNUTLS=
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withoutlibxml2
-set libxml2support=N
-set HAVE_LIBXML2=
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withouttiff
-set tiffsupport=N
-set HAVE_TIFF=
-shift
-goto again
-rem ----------------------------------------------------------------------
-:withoutxpm
-set xpmsupport=N
-set HAVE_XPM=
-shift
-goto again
-:withsvg
-shift
-set svgsupport=Y
-goto again
-rem ----------------------------------------------------------------------
-:distfiles
-set HAVE_DISTFILES=1
-shift
-set distfiles=%distfiles%%sep3%%1
-set sep3= %nothing%
-shift
-goto again
-rem ----------------------------------------------------------------------
-rem    Check that necessary utilities (cp and rm) are present.
-:checkutils
-echo Checking for 'cp'...
-cp configure.bat junk.bat
-if not exist junk.bat goto needcp
-echo Checking for 'rm'...
-rm junk.bat
-if exist junk.bat goto needrm
-goto checkcompiler
-:needcp
-echo You need 'cp' (the Unix file copy program) to build Emacs.
-goto end
-:needrm
-del junk.bat
-echo You need 'rm' (the Unix file delete program) to build Emacs.
-goto end
-rem ----------------------------------------------------------------------
-rem   Auto-detect compiler if not specified, and validate GCC if chosen.
-:checkcompiler
-if (%COMPILER%)==(cl) goto compilercheckdone
-if (%COMPILER%)==(gcc) goto checkgcc
-echo Checking whether 'gcc' is available...
-echo main(){} >junk.c
-gcc -c junk.c
-if exist junk.o goto checkgcc
-echo Checking whether 'cl' is available...
-cl -nologo -c junk.c
-if exist junk.obj goto clOK
-goto nocompiler
-:checkgcc
-if exist junk.o del junk.o
-Rem WARNING -- COMMAND.COM on some systems only looks at the first
-Rem            8 characters of a label.  So do NOT be tempted to change
-Rem            chkapi* into something fancier like checkw32api
-Rem You HAVE been warned!
-if (%nocygwin%) == (Y) goto chkapiN
-echo Checking whether gcc requires '-mno-cygwin'...
-echo #include "cygwin/version.h" >junk.c
-echo main(){} >>junk.c
-echo gcc -c junk.c >>config.log
-gcc -c junk.c >>config.log 2>&1
-if not exist junk.o goto chkapi
-echo gcc -mno-cygwin -c junk.c >>config.log
-gcc -mno-cygwin -c junk.c >>config.log 2>&1
-if exist junk.o set nocygwin=Y
-:chkapi
-echo The failed program was: >>config.log
-type junk.c >>config.log
-:chkapiN
-rm -f junk.c junk.o
-rem ----------------------------------------------------------------------
-rem   Older versions of the Windows API headers either don't have any of
-rem   the IMAGE_xxx definitions (the headers that come with Cygwin b20.1
-rem   are like this), or have a typo in the definition of
-rem   IMAGE_FIRST_SECTION (the headers with gcc/mingw32 2.95 have this
-rem   problem).  The gcc/mingw32 2.95.2 headers are okay, as are distros
-rem   of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.
-rem   Beginning with Emacs 23, we need usp10.h.
-rem
-echo Checking whether Windows API headers are too old...
-echo #include "windows.h" >junk.c
-echo #include "usp10.h" >>junk.c
-echo void test(PIMAGE_NT_HEADERS pHeader) >>junk.c
-echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c
-if (%nocygwin%) == (Y) goto chkapi1
-set cf=%usercflags%
-goto chkapi2
-:chkapi1
-set cf=%usercflags% -mno-cygwin
-:chkapi2
-echo on
-gcc %cf% -c junk.c
-@echo off
-@echo gcc %cf% -c junk.c >>config.log
-gcc %cf% -c junk.c >>config.log 2>&1
-set cf=
-if exist junk.o goto chkuser
-echo The failed program was: >>config.log
-type junk.c >>config.log
-goto nocompiler
-:chkuser
-rm -f junk.o
-echo int main (int argc, char *argv[]) {>junk.c
-echo char *usercflags = "%escusercflags%";>>junk.c
-echo }>>junk.c
-echo gcc -Werror -c junk.c >>config.log
-gcc -Werror -c junk.c >>config.log 2>&1
-if exist junk.o goto gccOk
-echo.
-echo Error in --cflags argument: %usercflags%
-echo Backslashes and quotes cannot be used with --cflags.  Please use forward
-echo slashes for filenames and paths (e.g. when passing directories to -I).
-rm -f junk.c
-goto end
-:nocompiler
-echo.
-echo Configure failed.
-echo To configure Emacs for Windows, you need to have either
-echo gcc-2.95 or later with Mingw32 and the Windows API headers,
-echo or MSVC 2.x or later.
-del junk.c
-goto end
-:gccOk
-set COMPILER=gcc
-echo Using 'gcc'
-rm -f junk.c junk.o
-Rem It is not clear what GCC version began supporting -mtune
-Rem and pentium4 on x86, so check this explicitly.
-echo main(){} >junk.c
-echo gcc -c -O2 -mtune=pentium4 junk.c >>config.log
-gcc -c -O2 -mtune=pentium4 junk.c >>config.log 2>&1
-if not errorlevel 1 goto gccMtuneOk
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set mf=-mcpu=i686
-rm -f junk.c junk.o
-goto gccdebug
-:gccMtuneOk
-echo GCC supports -mtune=pentium4 >>config.log
-set mf=-mtune=pentium4
-rm -f junk.c junk.o
-:gccdebug
-rem Check for DWARF-2 debug info support, else default to stabs
-echo main(){} >junk.c
-echo gcc -c -gdwarf-2 -g3 junk.c >>config.log
-gcc -c -gdwarf-2 -g3 junk.c >>config.log 2>&1
-if not errorlevel 1 goto gccdwarf
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set dbginfo=-gstabs+
-rm -f junk.c junk.o
-goto compilercheckdone
-:gccdwarf
-echo GCC supports DWARF-2 >>config.log
-set dbginfo=-gdwarf-2 -g3
-rm -f junk.c junk.o
-goto compilercheckdone
-:clOk
-set COMPILER=cl
-rm -f junk.c junk.obj
-echo Using 'MSVC'
-:compilercheckdone
-rem ----------------------------------------------------------------------
-rem   Check for external image libraries. Since they are loaded
-rem   dynamically, the libraries themselves do not need to be present
-rem   at compile time, but the header files are required.
-set mingwflag=
-if (%nocygwin%) == (N) goto flagsOK
-set mingwflag=-mno-cygwin
-:flagsOK
-if (%pngsupport%) == (N) goto pngDone
-echo Checking for libpng...
-echo #include "png.h" >junk.c
-echo main (){} >>junk.c
-rem   -o option is ignored with cl, but allows result to be consistent.
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto havePng
-echo ...png.h not found, building without PNG support.
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_PNG=
-goto :pngDone
-:havePng
-echo ...PNG header available, building with PNG support.
-set HAVE_PNG=1
-:pngDone
-rm -f junk.c junk.obj
-if (%tlssupport%) == (N) goto tlsDone
-rem this is a copy of the PNG detection
-echo Checking for libgnutls...
-echo #include "gnutls/gnutls.h" >junk.c
-echo main (){} >>junk.c
-rem   -o option is ignored with cl, but allows result to be consistent.
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto haveTls
-echo ...gnutls.h not found, building without TLS support.
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_GNUTLS=
-goto :tlsDone
-:haveTls
-echo ...GnuTLS header available, building with GnuTLS support.
-set HAVE_GNUTLS=1
-:tlsDone
-rm -f junk.c junk.obj
-if (%libxml2support%) == (N) goto xml2Done
-echo Checking for libxml2....
-echo #include "libxml/HTMLparser.h" >junk.c
-echo main(){} >>junk.c
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto havelibxml2
-echo ...libxml/HTMLparser.h not found, building without libxml2 support
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_LIBXML2=
-goto xml2Done
-:havelibxml2
-echo ...libxml2 header available, building with libxml2 support
-set HAVE_LIBXML2=1
-:xml2Done
-rm -f junk.c junk.obj
-if (%jpegsupport%) == (N) goto jpegDone
-echo Checking for jpeg-6b...
-echo #include "jconfig.h" >junk.c
-echo main (){} >>junk.c
-rem   -o option is ignored with cl, but allows result to be consistent.
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto haveJpeg
-echo ...jconfig.h not found, building without JPEG support.
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_JPEG=
-goto :jpegDone
-:haveJpeg
-echo ...JPEG header available, building with JPEG support.
-set HAVE_JPEG=1
-:jpegDone
-rm -f junk.c junk.obj
-if (%gifsupport%) == (N) goto gifDone
-echo Checking for libgif...
-rem giflib-5.0.0 needs size_t defined before gif_lib.h is included
-rem redirection characters need to be protected from the shell
-echo #include ^<stddef.h^> >junk.c
-echo #include "gif_lib.h" >>junk.c
-echo main (){} >>junk.c
-rem   -o option is ignored with cl, but allows result to be consistent.
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto haveGif
-echo ...gif_lib.h not found, building without GIF support.
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_GIF=
-goto :gifDone
-:haveGif
-echo ...GIF header available, building with GIF support.
-set HAVE_GIF=1
-:gifDone
-rm -f junk.c junk.obj
-if (%tiffsupport%) == (N) goto tiffDone
-echo Checking for tiff...
-echo #include "tiffio.h" >junk.c
-echo main (){} >>junk.c
-rem   -o option is ignored with cl, but allows result to be consistent.
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto haveTiff
-echo ...tiffio.h not found, building without TIFF support.
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_TIFF=
-goto :tiffDone
-:haveTiff
-echo ...TIFF header available, building with TIFF support.
-set HAVE_TIFF=1
-:tiffDone
-rm -f junk.c junk.obj
-if (%xpmsupport%) == (N) goto xpmDone
-echo Checking for libXpm...
-echo #define FOR_MSW 1 >junk.c
-echo #include "X11/xpm.h" >>junk.c
-echo main (){} >>junk.c
-rem   -o option is ignored with cl, but allows result to be consistent.
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto haveXpm
-echo ...X11/xpm.h not found, building without XPM support.
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_XPM=
-goto :xpmDone
-:haveXpm
-echo ...XPM header available, building with XPM support.
-set HAVE_XPM=1
-:xpmDone
-rm -f junk.c junk.obj
-if not (%svgsupport%) == (Y) goto :svgDone
-echo Checking for librsvg...
-echo #include "librsvg/rsvg.h" >junk.c
-echo main (){} >>junk.c
-rem   -o option is ignored with cl, but allows result to be consistent.
-echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
-if exist junk.obj goto haveSvg
-echo ...librsvg/rsvg.h or dependencies not found, building without SVG support.
-echo The failed program was: >>config.log
-type junk.c >>config.log
-set HAVE_RSVG=
-goto :svgDone
-:haveSvg
-echo ...librsvg header available, building with SVG support (EXPERIMENTAL).
-set HAVE_RSVG=1
-:svgDone
-rm -f junk.c junk.obj junk.err junk.out
-rem Any distfiles provided for building distribution? If no, we're done.
-if "(%HAVE_DISTFILES%)"=="()" goto :distFilesDone
-rem Any arguments to --distfiles specified? If no, we're done.
-if not "%distfiles%"=="" goto :checkDistFiles
-set distFilesOk=0
-echo No arguments specified for option --distfiles!
-goto distfilesDone
-:checkDistFiles
-echo Checking for distfiles...
-rem Check if all specified distfiles exist
-set fileNotFound=
-for %%d in (%distfiles%) do if not exist %%d set fileNotFound=%%d
-if not "%fileNotFound%"=="" goto distFilesNotFound
-set distFilesOK=1
-echo ...all distfiles found.
-goto :distFilesDone
-:distFilesNotFound
-set distFilesOk=0
-echo ...%fileNotFound% not found.
-set distfiles=
-goto :distfilesDone
-:distFilesDone
-set fileNotFound=
-rem ----------------------------------------------------------------------
-:genmakefiles
-echo Generating makefiles
-if %COMPILER% == gcc set MAKECMD=gmake
-if %COMPILER% == cl set MAKECMD=nmake
-rem   Pass on chosen settings to makefiles.
-rem
-rem   The weird place we put the redirection is to make sure no extra
-rem   whitespace winds up at the end of the Make variables, since some
-rem   variables, e.g. INSTALL_DIR, cannot stand that.  Yes, echo will
-rem   write the blanks between the end of command arguments and the
-rem   redirection symbol to the file.  OTOH, we cannot put the
-rem   redirection immediately after the last character of the command,
-rem   because environment variable expansion can yield a digit there,
-rem   which will then be misinterpreted as the file descriptor to
-rem   redirect...
-echo # Start of settings from configure.bat >config.settings
->>config.settings echo COMPILER=%COMPILER%
-if not "(%mf%)" == "()" >>config.settings echo MCPU_FLAG=%mf%
-if not "(%dbginfo%)" == "()" >>config.settings echo DEBUG_INFO=%dbginfo%
-if (%nodebug%) == (Y) >>config.settings echo NODEBUG=1
-if (%noopt%) == (Y) >>config.settings echo NOOPT=1
-if (%profile%) == (Y) >>config.settings echo PROFILE=1
-if (%nocygwin%) == (Y) >>config.settings echo NOCYGWIN=1
-if not "(%prefix%)" == "()" >>config.settings echo INSTALL_DIR=%prefix%
-if not "(%distfiles%)" == "()" >>config.settings echo DIST_FILES=%distfiles%
-rem We go thru docflags because usercflags could be "-DFOO=bar" -something
-rem and the if command cannot cope with this
-for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y
-if (%docflags%)==(Y) >>config.settings echo USER_CFLAGS=%usercflags%
-if (%docflags%)==(Y) >>config.settings echo ESC_USER_CFLAGS=%escusercflags%
-for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y
-if (%doldflags%)==(Y) >>config.settings echo USER_LDFLAGS=%userldflags%
-for %%v in (%extrauserlibs%) do if not (%%v)==() set doextralibs=Y
-if (%doextralibs%)==(Y) >>config.settings echo USER_LIBS=%extrauserlibs%
-echo # End of settings from configure.bat>>config.settings
-echo. >>config.settings
-copy config.nt config.tmp
-echo. >>config.tmp
-echo /* Start of settings from configure.bat.  */ >>config.tmp
-rem   We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify
-rem   processing of compiler options in w32.c:get_emacs_configuration_options
-if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%" >>config.tmp
-if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%" >>config.tmp
-if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp
-if (%enablechecking%) == (Y) echo #define ENABLE_CHECKING 1 >>config.tmp
-if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp
-if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp
-if not "(%HAVE_LIBXML2%)" == "()" echo #define HAVE_LIBXML2 1 >>config.tmp
-if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>config.tmp
-if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>config.tmp
-if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>config.tmp
-if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>config.tmp
-if "(%HAVE_RSVG%)" == "(1)" echo #define HAVE_RSVG 1 >>config.tmp
-echo /* End of settings from configure.bat.  */ >>config.tmp
-Rem See if fc.exe returns a meaningful exit status.  If it does, we
-Rem might as well avoid unnecessary overwriting of config.h and epaths.h,
-Rem since this forces recompilation of every source file.
-if exist foo.bar del foo.bar
-fc /b foo.bar foo.bar >nul 2>&1
-if not errorlevel 2 goto doCopy
-fc /b config.tmp ..\src\config.h >nul 2>&1
-if errorlevel 1 goto doCopy
-fc /b paths.h ..\src\epaths.h >nul 2>&1
-if not errorlevel 1 goto dontCopy
-:doCopy
-copy config.tmp ..\src\config.h
-copy paths.h ..\src\epaths.h
-:dontCopy
-if exist config.tmp del config.tmp
-copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile
-if exist ..\admin\unidata copy /b config.settings+%MAKECMD%.defs+..\admin\unidata\makefile.w32-in ..\admin\unidata\makefile
-copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile
-copy /b config.settings+%MAKECMD%.defs+..\lib\makefile.w32-in ..\lib\makefile
-copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile
-copy /b config.settings+%MAKECMD%.defs+..\doc\emacs\makefile.w32-in ..\doc\emacs\makefile
-copy /b config.settings+%MAKECMD%.defs+..\doc\misc\makefile.w32-in ..\doc\misc\makefile
-copy /b config.settings+%MAKECMD%.defs+..\doc\lispref\makefile.w32-in ..\doc\lispref\makefile
-copy /b config.settings+%MAKECMD%.defs+..\doc\lispintro\makefile.w32-in ..\doc\lispintro\makefile
-if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile
-copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile
-rem   Use the default (no-op) Makefile.in if the nt version is not present.
-if exist ..\leim\makefile.w32-in copy /b config.settings+%MAKECMD%.defs+..\leim\makefile.w32-in ..\leim\makefile
-if not exist ..\leim\makefile.w32-in copy /b config.settings+%MAKECMD%.defs+..\leim\Makefile.in ..\leim\makefile
-del config.settings
-Rem Some people use WinZip which doesn't create empty directories!
-if not exist ..\site-lisp\nul mkdir ..\site-lisp\
-Rem Update subdirs.el only if it is different or fc.exe doesn't work.
-if exist foo.bar del foo.bar
-fc /b foo.bar foo.bar >nul 2>&1
-if not errorlevel 2 goto doUpdateSubdirs
-fc /b subdirs.el ..\site-lisp\subdirs.el >nul 2>&1
-if not errorlevel 1 goto dontUpdateSubdirs
-:doUpdateSubdirs
-if exist ..\site-lisp\subdirs.el del ..\site-lisp\subdirs.el
-copy subdirs.el ..\site-lisp\subdirs.el
-:dontUpdateSubdirs
-echo.
-rem check that we have all the libraries we need.
-set libsOK=1
-if not "(%HAVE_XPM%)" == "()" goto checkpng
-if (%xpmsupport%) == (N) goto checkpng
- set libsOK=0
- echo XPM support is missing. It is required for color icons in the toolbar.
- echo   Install libXpm development files or use --without-xpm
-:checkpng
-if not "(%HAVE_PNG%)" == "()" goto checkjpeg
-if (%pngsupport%) == (N) goto checkjpeg
- set libsOK=0
- echo PNG support is missing.
- echo   Install libpng development files or use --without-png
-:checkjpeg
-if not "(%HAVE_JPEG%)" == "()" goto checktiff
-if (%jpegsupport%) == (N) goto checktiff
- set libsOK=0
- echo JPEG support is missing.
- echo   Install jpeg development files or use --without-jpeg
-:checktiff
-if not "(%HAVE_TIFF%)" == "()" goto checkgif
-if (%tiffsupport%) == (N) goto checkgif
- set libsOK=0
- echo TIFF support is missing.
- echo   Install libtiff development files or use --without-tiff
-:checkgif
-if not "(%HAVE_GIF%)" == "()" goto checkdistfiles
-if (%gifsupport%) == (N) goto checkdistfiles
- set libsOK=0
- echo GIF support is missing.
- echo   Install giflib or libungif development files or use --without-gif
-:checkdistfiles
-if "(%HAVE_DISTFILES%)" == "()" goto donelibchecks
-if (%distFilesOk%) == (1) goto donelibchecks
-echo.
-echo Files specified with option --distfiles could not be found.
-echo   Fix these issues before running make dist
-:donelibchecks
-if (%libsOK%) == (1) goto success
-echo.
-echo Important libraries are missing. Fix these issues before running make.
-goto end
-:success
-echo Emacs successfully configured.
-echo Emacs successfully configured. >>config.log
-if (%MAKECMD%) == (gmake) set MAKECMD=make
-echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install.
-goto end
-:SmallEnv
-echo Your environment size is too small.  Please enlarge it and rerun configure.
-echo For example, type "command.com /e:2048" to have 2048 bytes available.
-set $foo$=
-:end
-set prefix=
-set nodebug=
-set noopt=
-set enablechecking=
-set profile=
-set nocygwin=
-set COMPILER=
-set MAKECMD=
-set usercflags=
-set docflags=
-set userldflags=
-set doldflags=
-set mingwflag=
-set mf=
-set distfiles=
-set HAVE_DISTFILES=
-set distFilesOk=
-set pngsupport=
-set tlssupport=
-set libxml2support=
-set jpegsupport=
-set gifsupport=
-set tiffsupport=
-set xpmsupport=
-set svgsupport=
-set libsOK=
-set HAVE_GIF=
-set HAVE_JPEG=
-set HAVE_PNG=
-set HAVE_TIFF=
-set HAVE_XPM=
-set dbginfo=
-endlocal
-set use_extensions=
diff --git a/nt/emacs-src.tags b/nt/emacs-src.tags
deleted file mode 100644
index 8c187133454..00000000000
--- a/nt/emacs-src.tags
+++ /dev/null
@@ -1,6 +0,0 @@
-  This file defines the regular expressions for etags to look for
-  in the src directory.  It is used by the w32 build to work around
-  the annoyances of quoting command-line arguments with various
-  w32 shell.
-/[      ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/
diff --git a/nt/envadd.bat b/nt/envadd.bat
deleted file mode 100644
index 21f0f4b08f0..00000000000
--- a/nt/envadd.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-rem  Hack to change/add environment variables in the makefiles for the
-rem  Windows platform.
-rem Copyright (C) 2003-2015 Free Software Foundation, Inc.
-rem  This file is part of GNU Emacs.
-rem  GNU Emacs is free software: you can redistribute it and/or modify
-rem  it under the terms of the GNU General Public License as published by
-rem  the Free Software Foundation, either version 3 of the License, or
-rem  (at your option) any later version.
-rem  GNU Emacs is distributed in the hope that it will be useful,
-rem  but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem  GNU General Public License for more details.
-rem  You should have received a copy of the GNU General Public License
-rem  along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
-rem  Usage:
-rem    envadd "ENV1=VAL1" "ENV2=VAL2" ... /C <command line>
-rem
-rem  The "/C" switch marks the end of environment variables, and the
-rem  beginning of the command line.
-rem
-rem  By Peter 'Luna' Runestig <peter@runestig.com> 2003
-:Loop
-if .%1% == ./C goto EndLoop
-rem just to avoid an endless loop:
-if .%1% == . goto EndLoop
-set %1
-shift
-goto Loop
-:EndLoop
-rem Eat the "/C"
-shift
-rem Now, run the command line
-%1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/nt/gmake.defs b/nt/gmake.defs
deleted file mode 100644
index 90a3709da4a..00000000000
--- a/nt/gmake.defs
+++ /dev/null
@@ -1,333 +0,0 @@
-#  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
-# This file is part of GNU Emacs.
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-# Ensure 'all' is the default target
-all:
-# NOTES
-#
-# I tried to force gmake to use the native shell for simplicity, by
-# setting SHELL as below, but this didn't work reliably because of
-# various case sensitivity niggles.  Specifically, COMSPEC (which is in
-# fact usually spelled ComSpec on NT, to make life difficult) typically
-# references "cmd.exe" (on NT) when the file is actually called
-# "CMD.EXE" on disk for hysterical raisons.  As a result, GNU make
-# thinks it doesn't exist (unless compiled with a switch to ignore
-# case), and so doesn't change which shell it will invoke to execute
-# commands.
-#
-# It would be possible, though very tedious using just gmake facilities,
-# to convert the COMSPEC value to uppercase to solve this problem, but
-# it isn't worth it.  That is partly because, even when using the native
-# shell, gmake tends to not be happy with backslashes in command
-# strings.  The obvious solution is to use forward slashes as much as
-# possible, which can be made to work most of the time (putting
-# filenames in quotes often helps), but there are still some internal
-# cmd.exe commands like `del' and `copy' that won't work with them.
-# Although it is possible to convert slashes to backslashes when
-# necessary, gmake requires explicitly calling its subst function, which
-# nmake does not understand).  For this reason, it is simplest to
-# mandate that rm and cp be available, so we can use Unix-format file
-# names everywhere.  (Fortunately both MS and GNU make, and the
-# respective compilers, are happy with Unix-format names.)
-#
-# Since we cannot easily force the choice of a particular shell, we must
-# make the effort to cope with whichever shell is being used.
-# Fortunately, the only command we need to use that is shell specific is
-# the testing of a file's existence for the purpose of working out when
-# we are copying files to their original location.  That particular
-# requirement is abstracted easily enough.
-#
-# The only other problem area was the change of directory when running
-# temacs to dump emacs.exe (where gmake doesn't support cd foo in any
-# useful way), but that has been resolved by modifying the Windows
-# unexec function slightly to not require the directory change while
-# still allowing objects and binaries to be in subdirectories.
-# This doesn't work.
-#SHELL:=$(COMSPEC)
-# Determine whether make is using sh or cmd/command as shell; cmd.exe
-# will output "ECHO is on" when echo is given by itself, while sh will
-# not produce any output.
-sh_output := $(shell echo)
-ifeq "$(findstring ECHO, $(sh_output))" "ECHO"
-THE_SHELL = $(COMSPEC)$(ComSpec)
-SHELLTYPE=CMD
-SWITCHCHAR=/
-else
-USING_SH = 1
-THE_SHELL = $(SHELL)
-SHELLTYPE=SH
-# MSYS needs to double the slash in cmd-style switches to avoid
-# interpreting /x as a Posix style file name reference
-ifneq ($(MSYSTEM),)
-SWITCHCHAR=//
-else
-SWITCHCHAR=/
-endif
-endif
-MAKETYPE=gmake
-# The following "ifeq" does not appear to DTRT, and therefore breaks
-# the build on mingw32. Also the -m option does not exist in many
-# (reasonably recent even) versions of Cygwin. These issues need to be
-# remedied before putting this cygpath kludge back in.
-# Convert CURDIR to native file name, if in Cygwin format
-#ifeq "$(shell cygpath $(CURDIR))" "$(CURDIR)"
-#CURDIR         := $(shell cygpath -m $(CURDIR))
-#endif
-THISDIR         = .
-# Cygwin has changed quoting rules somewhat since b20, in a way that
-# affects makefiles using sh as the command processor, so we need to
-# detect which rules to use.
-ifdef USING_SH
-sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2)
-sh_output := $(shell echo foo")
-# This single quote " is to fix fontification due to previous line
-ifeq "$(sh_output)" ""
-NEW_CYGWIN = 1
-endif
-# By default, newer versions of Cygwin mess with NTFS ACLs in an
-# attempt to emulate traditional posix file permissions. This can
-# cause bad effects, such as .exe files that are missing the
-# FILE_EXECUTE/FILE_GENERIC_EXECUTE permissions when they are created
-# with Cygwin commands that don't expect to be creating executable
-# files. Then when we later use a non-Cygwin program to create the
-# real .exe, the previous Cygwin defined ACL sticks.
-CYGWIN=nontsec
-export CYGWIN
-endif
-ALL_DEPS        = $^
-EMPTY =
-SPACE = $(EMPTY) $(EMPTY)
-SUBSYSTEM_WINDOWS=-Wl,-subsystem,windows
-SUBSYSTEM_CONSOLE=-Wl,-subsystem,console
-# INSTALL_DIR is the directory into which emacs will be installed.
-#
-ifndef INSTALL_DIR
-INSTALL_DIR     = $(CURDIR)/..
-endif
-export EMACSLOADPATH
-# Determine the architecture we're running on.
-# Define ARCH for our purposes;
-# Define CPU for use by ntwin32.mak;
-# Define CONFIG_H to the appropriate config.h for the system;
-#
-ifdef PROCESSOR_ARCHITECTURE
-# We're on Windows NT
-CPU             = $(PROCESSOR_ARCHITECTURE)
-CONFIG_H        = config.nt
-OS_TYPE         = windowsnt
- ifeq "$(PROCESSOR_ARCHITECTURE)" "x86"
-ARCH            = i386
-CPU             = i386
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-x86.manifest
- else
-  ifeq "$(PROCESSOR_ARCHITECTURE)" "MIPS"
-ARCH            = mips
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-mips.manifest
-  else
-   ifeq "$(PROCESSOR_ARCHITECTURE)" "ALPHA"
-ARCH            = alpha
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-alpha.manifest
-   else
-    ifeq "$(PROCESSOR_ARCHITECTURE)" "PPC"
-ARCH            = ppc
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-ppc.manifest
-    else
-     $(error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)")
-    endif
-   endif
-  endif
- endif
-else
-# We're on Windows 95
-ARCH            = i386
-CPU             = i386
-CONFIG_H        = config.nt
-OS_TYPE         = windows95
-endif
-AR              = ar -rsc
-AR_OUT          =
-CC              = gcc
-CC_OUT          = -o$(SPACE)
-LINK            = gcc
-LINK_OUT        = -o$(SPACE)
-RC              = windres -O coff
-RC_OUT          = -o$(SPACE)
-RC_INCLUDE      = --include-dir$(SPACE)
-libc            =
-baselibs        =
-O               = o
-A               = a
-BASE_LIBS       = $(libc) $(baselibs)
-ADVAPI32        = -ladvapi32
-COMCTL32        = -lcomctl32
-COMDLG32        = -lcomdlg32
-GDI32           = -lgdi32
-MPR             = -lmpr
-SHELL32         = -lshell32
-USER32          = -luser32
-WSOCK32         = -lwsock32
-WINMM           = -lwinmm
-WINSPOOL        = -lwinspool
-OLE32           = -lole32
-UNISCRIBE       = -lusp10
-UUID            = -luuid
-# Used by src/makefile.w32-in, since Nmake barfs on $(func SOMETHING)
-OBJ0_c          = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0))
-OBJ1_c          = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
-OBJ2_c          = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2))
-ifdef NOOPT
-DEBUG_CFLAGS    = -DEMACSDEBUG -fno-crossjumping -std=gnu99
-else
-DEBUG_CFLAGS    =
-endif
-MWINDOWS        = -mwindows
-CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
-ESC_CFLAGS      = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
-EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
-ifdef PROFILE
-PROFILE_CFLAGS  = -pg
-PROFILE_LDFLAGS  = -pg
-else
-PROFILE_CFLAGS  =
-PROFILE_LDFLAGS =
-endif
-# see comments in allocate_heap in w32heap.c before changing any of the
-# -stack, -heap, or -image-base settings.
-TEMACS_EXTRA_LINK = -Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 $(SUBSYSTEM_CONSOLE) -Wl,-entry,__start -Wl,-Map,$(BLD)/temacs.map
-ifdef NOOPT
-OBJDIR          = oo
-else
-OBJDIR          = oo-spd
-endif
-$(OBJDIR):;     -mkdir "$(OBJDIR)"
-BLD             = $(OBJDIR)/$(ARCH)
-stamp_BLD:      $(OBJDIR)
-                -mkdir "$(BLD)"
-                echo $(BLD) > $@
-COMPILER_TEMP_FILES =
-CP              = cp -f
-CP_DIR          = cp -rf
-DEL             = rm
-DEL_TREE        = rm -r
-DIRNAME         = $(notdir $(CURDIR))
-ifdef USING_SH
-IFNOTSAMEDIR    = if [ ! -s ../$(DIRNAME)_same-dir.tst ] ; then
-FOREACH         = for f in
-FORVAR          = $${f}
-FORDO           = ; do
-ENDFOR          = ; done
-ENDIF           = ; fi
-ARGQUOTE        = '
-ifdef NEW_CYGWIN
-DQUOTE          = "
-else
-DQUOTE          = ""
-endif
-else
-IFNOTSAMEDIR    = if not exist ../$(DIRNAME)_same-dir.tst
-FOREACH         = for %%f in (
-FORVAR          = %%f
-FORDO           = ) do
-ENDFOR          =
-ENDIF           =
-ARGQUOTE        = "
-DQUOTE          = \"
-endif
-ifdef NODEBUG
-DEBUG_FLAG =
-DEBUG_LINK =
-else
-DEBUG_FLAG = $(DEBUG_INFO)
-DEBUG_LINK = $(DEBUG_INFO)
-endif
-ifdef NOCYGWIN
-NOCYGWIN = -mno-cygwin
-endif
-ifdef USER_LIBS
-USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
-endif
-PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
-ifeq "$(ARCH)" "i386"
-ifdef NOOPT
-ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN)
-else
-ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \
-                  # -fbuiltin \
-                  # -finline-functions \
-                  # -fomit-frame-pointer
-endif
-ARCH_LDFLAGS    = $(SYS_LDFLAGS)
-else
-ERROR Unknown architecture type "$(ARCH)".
-endif
-LINK_FLAGS      = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(PROFILE_LDFLAGS) $(NOCYGWIN) $(USER_LDFLAGS)
-export XMFLAGS
-.DEFAULT:
-$(BLD)/%.o: %.c
-                $(CC) $(CFLAGS) $(CC_OUT)$@ $<
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
deleted file mode 100644
index ff2bf27cde8..00000000000
--- a/nt/makefile.w32-in
+++ /dev/null
@@ -1,465 +0,0 @@
-# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
-#
-# Top level makefile for building GNU Emacs on Windows NT
-#
-# This file is part of GNU Emacs.
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-# FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out
-#        (and remove or replace this comment).
-VERSION         = 25.0.50
-TMP_DIST_DIR    = emacs-$(VERSION)
-TRES            = $(BLD)/emacs.res
-CLIENTRES       = $(BLD)/emacsclient.res
-LOCAL_FLAGS     = -DOLD_PATHS=1
-XMFLAGS         =
-ALL             = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \
-                  $(BLD)/cmdproxy.exe $(BLD)/addsection.exe $(BLD)/preprep.exe
-$(BLD)/addpm.exe: $(BLD)/addpm.$(O)
-                  $(LINK) $(LINK_OUT)$@ \
-                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \
-                  $(USER32) $(OLE32) $(UUID) $(SHELL32)
-$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)
-                  $(LINK) $(LINK_OUT)$@ \
-                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
-$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)
-                  $(LINK) $(LINK_OUT)$@ \
-                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
-$(BLD)/addsection.exe: $(BLD)/addsection.$(O)
-                  $(LINK) $(LINK_OUT)$@ \
-                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
-$(BLD)/preprep.exe: $(BLD)/preprep.$(O)
-                  $(LINK) $(LINK_OUT)$@ \
-                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)
-#
-# The resource file.  NT 3.10 requires the use of cvtres; even though
-# it is not necessary on later versions, it is still ok to use it.
-#
-$(TRES):        emacs.rc icons/emacs.ico $(EMACS_MANIFEST) stamp_BLD
-                $(RC) $(RC_OUT)$(TRES) emacs.rc
-$(CLIENTRES):   emacsclient.rc stamp_BLD
-                $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc
-$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
-                  $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \
-                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
-which-sh:
-        @echo Using $(THE_SHELL) as shell.
-# These depend on stamp_BLD to make sure the $(BLD) directory is created
-# before the compilation begins, even if Make runs several commands
-# in parallel under "make -j".
-#
-$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): stamp_BLD
-#
-# Build emacs
-#
-all:    which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
-all-other-dirs-$(MAKETYPE): maybe-bootstrap
-all-other-dirs-nmake: $(BLD)/addsection.exe
-        cd ..\lib
-        $(MAKE) $(MFLAGS) all
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) all
-        cd ..\src
-        $(MAKE) $(MFLAGS) all
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) all
-        cd ..\leim
-        $(MAKE) $(MFLAGS) all
-        cd ..\nt
-all-other-dirs-gmake: $(BLD)/addsection.exe
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim all
-recompile:      recompile-$(MAKETYPE)
-recompile-nmake:
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) recompile
-        cd ..\nt
-recompile-gmake:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp recompile
-#### Bootstrapping.
-### This is meant for Emacs maintainers only.  It first cleans the
-### lisp subdirectory, removing all compiled Lisp files.  Then a
-### special emacs executable is built from Lisp sources, which is then
-### used to compile Lisp files.  The last step is a "normal" make.
-maybe-bootstrap: maybe-bootstrap-$(SHELLTYPE)
-# dummy target to force other targets to be evaluated.
-doit:
-maybe-bootstrap-CMD:    doit
-        @echo .
-        @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing.  You should either
-        @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow
-        @echo .
-        @if not EXIST ..\lisp\abbrev.elc exit -1
-maybe-bootstrap-SH: doit
-        @if [ ! -f ../lisp/abbrev.elc ] ; then \
-          echo; \
-          echo "Essential Lisp files seem to be missing.  You should either"; \
-          echo "do \`make bootstrap' or create \`lisp/abbrev.elc' somehow.";  \
-          echo; \
-          exit -1; \
-        fi
-# Bootstrap depends on cmdproxy because some Lisp functions
-# loaded during bootstrap may need to run shell commands.
-bootstrap:      $(BLD)/addsection.exe $(BLD)/cmdproxy.exe bootstrap-$(MAKETYPE)
-        $(MAKE) $(MFLAGS) $(XMFLAGS) all
-bootstrap-nmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) bootstrap-clean
-        cd ..\src
-        $(MAKE) $(MFLAGS) clean
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) clean make-docfile
-        cd ..\lib
-        $(MAKE) $(MFLAGS) clean all
-        cd ..\src
-        $(MAKE) $(MFLAGS) bootstrap
-        $(MAKE) $(MFLAGS) bootstrap-clean
-        cd ..\nt
-        $(CP) $(BLD)/cmdproxy.exe ../bin
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) DOC
-        cd ..\nt
-bootstrap-gmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src make-docfile
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
-        $(CP) $(BLD)/cmdproxy.exe ../bin
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC
-bootstrap-clean: bootstrap-clean-$(MAKETYPE)
-bootstrap-clean-nmake:
-        cd ..\src
-        $(MAKE) $(MFLAGS) bootstrap-clean
-        cd ..\lib
-        $(MAKE) $(MFLAGS) clean
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) bootstrap-clean
-bootstrap-clean-gmake:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
-$(INSTALL_DIR):
-        - mkdir "$(INSTALL_DIR)"
-$(INSTALL_DIR)/bin: $(INSTALL_DIR)
-        - mkdir "$(INSTALL_DIR)/bin"
-#
-# Build and install emacs in INSTALL_DIR
-#
-.PHONY: install-bin install-shortcuts
-install: install-bin install-shortcuts
-install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
-        - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
-        - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
-        - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
-        - $(CP) README.W32 $(INSTALL_DIR)
-        - $(DEL) ../$(DIRNAME)_same-dir.tst
-        - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
-        echo SameDirTest > "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
-        - mkdir "$(INSTALL_DIR)/etc"
-        - mkdir "$(INSTALL_DIR)/info"
-        - mkdir "$(INSTALL_DIR)/lock"
-        - mkdir "$(INSTALL_DIR)/data"
-        - mkdir "$(INSTALL_DIR)/site-lisp"
-        - mkdir "$(INSTALL_DIR)/etc/icons"
-        $(IFNOTSAMEDIR) $(CP) ../site-lisp/subdirs.el $(INSTALL_DIR)/site-lisp $(ENDIF)
-        $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF)
-        - $(CP_DIR) icons $(INSTALL_DIR)/etc
-        $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF)
-        $(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF)
-        - $(CP) ../COPYING $(INSTALL_DIR)/bin
-        - $(DEL) ../$(DIRNAME)_same-dir.tst
-        - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
-install-other-dirs-nmake: all
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) install
-        cd ..\src
-        $(MAKE) $(MFLAGS) install
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) install
-        cd ..\leim
-        $(MAKE) $(MFLAGS) install
-        cd ..\nt
-install-other-dirs-gmake: all
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
-install-addpm: $(INSTALL_DIR)/bin $(BLD)/addpm.exe
-        - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
-install-shortcuts: install-addpm
-        "$(INSTALL_DIR)/bin/addpm" -q
-maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)
-maybe-copy-distfiles-CMD: create-tmp-dist-dir doit
-        @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
-maybe-copy-distfiles-SH: create-tmp-dist-dir doit
-        @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" ] ; then \
-          $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \
-        fi
-create-tmp-dist-dir:
-        mkdir "$(TMP_DIST_DIR)"
-# Also create bin directory for dist files.
-        mkdir "$(TMP_DIST_DIR)/bin"
-dist: install-bin install-addpm maybe-copy-distfiles
-        $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)
-        $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)
-        $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)
-        $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR)
-        $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR)
-        $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR)
-        $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR)
-        $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR)
-        $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR)
-        $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR)
-        $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE)
-        $(DEL_TREE) $(TMP_DIST_DIR)
-force-info:
-# Note that doc/emacs/makefile knows how to
-# put the info files in $(infodir),
-# so we can do ok running make in the build dir.
-info: force-info info-$(MAKETYPE)
-info-nmake:
-        cd ..\doc\emacs
-        $(MAKE) $(MFLAGS) info
-        cd ..\misc
-        $(MAKE) $(MFLAGS) info
-        cd ..\lispref
-        $(MAKE) $(MFLAGS) info
-        cd ..\lispintro
-        $(MAKE) $(MFLAGS) info
-        cd $(MAKEDIR)
-info-gmake: emacs misc lispref lispintro
-emacs misc lispref lispintro:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/$@ info
-#
-# Maintenance
-#
-clean:  clean-other-dirs-$(MAKETYPE)
-        - $(DEL) $(COMPILER_TEMP_FILES)
-        - $(DEL_TREE) $(OBJDIR)
-        - $(DEL) stamp_BLD
-        - $(DEL) ../etc/DOC
-clean-other-dirs-nmake:
-        cd ..\lib
-        $(MAKE) $(MFLAGS) clean
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) clean
-        cd ..\src
-        $(MAKE) $(MFLAGS) clean
-        cd ..\doc\lispintro
-        $(MAKE) $(MFLAGS) clean
-        cd ..\lispref
-        $(MAKE) $(MFLAGS) clean
-        cd ..\..\leim
-        $(MAKE) $(MFLAGS) clean
-        cd ..\doc\emacs
-        $(MAKE) $(MFLAGS) clean
-        cd ..\misc
-        $(MAKE) $(MFLAGS) clean
-        cd ..\..\nt
-clean-other-dirs-gmake:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean
-cleanall-other-dirs-nmake:
-        cd ..\lib
-        $(MAKE) $(MFLAGS) cleanall
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) cleanall
-        cd ..\src
-        $(MAKE) $(MFLAGS) cleanall
-        cd ..\nt
-cleanall-other-dirs-gmake:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib cleanall
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall
-# We used to delete *~ here, but that might inadvertently remove
-# precious files if it happens to match their short 8+3 aliases.
-cleanall: clean cleanall-other-dirs-$(MAKETYPE)
-         - $(DEL_TREE) obj
-         - $(DEL_TREE) obj-spd
-         - $(DEL_TREE) oo
-         - $(DEL_TREE) oo-spd
-top-distclean:
-        - $(DEL) $(COMPILER_TEMP_FILES)
-        - $(DEL_TREE) obj
-        - $(DEL_TREE) obj-spd
-        - $(DEL_TREE) oo
-        - $(DEL_TREE) oo-spd
-        - $(DEL) stamp_BLD
-        - $(DEL) ../etc/DOC
-        - $(DEL) config.log Makefile
-        - $(DEL) ../README.W32
-distclean: distclean-other-dirs-$(MAKETYPE) top-distclean
-distclean-other-dirs-nmake:
-        cd ..\lib
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\src
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\leim
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\doc\emacs
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\misc
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\lispintro
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\lispref
-        $(MAKE) $(MFLAGS) distclean
-        cd ..\..\nt
-distclean-other-dirs-gmake:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean
-maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean
-maintainer-clean-other-dirs-nmake:
-        cd ..\lib
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\lib-src
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\src
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\lisp
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\leim
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\doc\emacs
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\misc
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\lispintro
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\lispref
-        $(MAKE) $(MFLAGS) maintainer-clean
-        cd ..\..\nt
-maintainer-clean-other-dirs-gmake:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean
-        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean
-realclean: cleanall
-        - $(DEL_TREE) ../bin
-TAGS: TAGS-$(MAKETYPE)
-frc:
-TAGS-gmake: frc
-        ../lib-src/$(BLD)/etags $(CURDIR)/*.c
-        $(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP
-        $(MAKE) $(MFLAGS) -C ../lib-src TAGS
-        $(MAKE) $(MFLAGS) -C ../lib TAGS
-TAGS-nmake:
-        echo This target is not supported with NMake
-.PHONY: frc
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
deleted file mode 100644
index f69ee485c11..00000000000
--- a/nt/multi-install-info.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-@echo off
-rem  Hack to run install-info with multiple info files on the command
-rem  line on the Windows platform.
-rem Copyright (C) 2003-2015 Free Software Foundation, Inc.
-rem  This file is part of GNU Emacs.
-rem   GNU Emacs is free software: you can redistribute it and/or modify
-rem   it under the terms of the GNU General Public License as published by
-rem   the Free Software Foundation, either version 3 of the License, or
-rem   (at your option) any later version.
-rem   GNU Emacs is distributed in the hope that it will be useful,
-rem   but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem   GNU General Public License for more details.
-rem   You should have received a copy of the GNU General Public License
-rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
-rem  Usage:
-rem   multi-install-info <switch passed to install-info> FILE1 FILE2 ...
-rem
-rem  By Peter 'Luna' Runestig <peter@runestig.com> 2003
-set INSTALL_INFO=install-info
-set II_SWITCH=%1=%2
-rem Eat the install-info switch:
-shift
-:Loop
-shift
-if .%1% == . goto EndLoop
-%INSTALL_INFO% %II_SWITCH% %1
-goto Loop
-:EndLoop
diff --git a/nt/nmake.defs b/nt/nmake.defs
deleted file mode 100644
index 5424b9d9125..00000000000
--- a/nt/nmake.defs
+++ /dev/null
@@ -1,294 +0,0 @@
-#  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
-# This file is part of GNU Emacs.
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-# Ensure 'all' is the default target
-all:
-THE_SHELL = $(COMSPEC)
-SHELLTYPE=CMD
-SWITCHCHAR=/
-MAKETYPE=nmake
-CURDIR          = $(MAKEDIR:\=/)
-THISDIR         = $(MAKEDIR)
-DIRNAME         =
-ALL_DEPS        = $**
-SUBSYSTEM_WINDOWS=-subsystem:windows
-SUBSYSTEM_CONSOLE=-subsystem:console
-# INSTALL_DIR is the directory into which emacs will be installed.
-#
-!ifndef INSTALL_DIR
-INSTALL_DIR     = $(CURDIR)/..
-!endif
-# Ensure EMACSLOADPATH is defined in the environment.
-#
-!if [set EMACSLOADPATH=foo]
-!endif
-# Allow detection of builds with MSVC 5 or later, so we can
-# speed up compiles (see rule at end).
-#
-_NMAKE_VER_5=162
-_NMAKE_VER_4=0
-!IFNDEF _NMAKE_VER
-_NMAKE_VER=$(_NMAKE_VER_4)
-!ENDIF
-# Check that the INCLUDE and LIB environment variables are set.
-#
-!ifndef INCLUDE
-!error The INCLUDE environment variable needs to be set.
-!endif
-!ifndef LIB
-!error The LIB environment variable needs to be set.
-!endif
-# Determine the architecture we're running on.
-# Define ARCH for our purposes;
-# Define CPU for use by ntwin32.mak;
-# Define CONFIG_H to the appropriate config.h for the system;
-#
-!ifdef PROCESSOR_ARCHITECTURE
-# We're on Windows NT
-CPU             = $(PROCESSOR_ARCHITECTURE)
-CONFIG_H        = config.nt
-OS_TYPE         = windowsnt
-! if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-ARCH            = i386
-CPU             = i386
-! else
-!  if "$(PROCESSOR_ARCHITECTURE)" == "MIPS"
-ARCH            = mips
-!  else
-!   if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA"
-ARCH            = alpha
-!   else
-!    if "$(PROCESSOR_ARCHITECTURE)" == "PPC"
-ARCH            = ppc
-!    else
-!     if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-ARCH            = AMD64
-!     else
-!      error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)"
-!     endif
-!    endif
-!   endif
-!  endif
-! endif
-!else
-# We're on Windows 95
-ARCH            = i386
-CPU             = i386
-CONFIG_H        = config.nt
-OS_TYPE         = windows95
-!endif
-AR              = lib
-AR_OUT          = -out:
-CC              = cl
-CC_OUT          = -Fo
-LINK            = link
-LINK_OUT        = -out:
-RC              = rc $(ARCH_RCFLAGS)
-RC_OUT          = -Fo
-RC_INCLUDE      = -i
-USE_CRT_DLL     = 1
-!if $(USE_CRT_DLL)
-libc            = msvcrt$(D).lib
-EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1
-!else
-libc            = libcmt$(D).lib
-EMACS_EXTRA_C_FLAGS= -D_MT
-!endif
-baselibs        =
-O               = obj
-A               = lib
-BASE_LIBS       = $(libc) $(baselibs) oldnames.lib
-ADVAPI32        = advapi32.lib
-COMCTL32        = comctl32.lib
-COMDLG32        = comdlg32.lib
-GDI32           = gdi32.lib
-MPR             = mpr.lib
-SHELL32         = shell32.lib
-USER32          = user32.lib
-WSOCK32         = wsock32.lib
-WINMM           = winmm.lib
-WINSPOOL        = winspool.lib
-OLE32           = ole32.lib
-UNISCRIBE       = usp10.lib
-UUID            = uuid.lib
-!ifdef NOOPT
-DEBUG_CFLAGS    = -DEMACSDEBUG
-!else
-DEBUG_CFLAGS    =
-!endif
-MWINDOWS        = -subsystem:windows -entry:mainCRTStartup
-CFLAGS          = -I. $(ARCH_CFLAGS) -D_CRT_SECURE_NO_WARNINGS \
-                  $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
-ESC_CFLAGS      = -I. $(ARCH_CFLAGS) -D_CRT_SECURE_NO_WARNINGS \
-                  $(DEBUG_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
-#SYS_LDFLAGS    = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
-SYS_LDFLAGS     = -nologo -manifest -dynamicbase:no -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
-# see comments in allocate_heap in w32heap.c before changing any of the
-# -stack, -heap, or -base settings.
-!if "$(ARCH)" == "i386"
-TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -pdb:$(BLD)\temacs.pdb -machine:x86 $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)
-!elseif "$(ARCH)" == "AMD64"
-TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x400000000 -pdb:$(BLD)\temacs.pdb -machine:x64 $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)
-!endif
-!ifdef NOOPT
-OBJDIR          = obj
-!else
-OBJDIR          = obj-spd
-!endif
-$(OBJDIR):;     -mkdir $(OBJDIR)
-BLD             = $(OBJDIR)/$(ARCH)
-stamp_BLD:      $(OBJDIR)
-                -mkdir "$(BLD)"
-                echo $(BLD) > $@
-COMPILER_TEMP_FILES = *.pdb
-CP              = cp -f
-CP_DIR          = cp -rf
-IFNOTSAMEDIR    = if not exist ..\$(DIRNAME)_same-dir.tst
-ENDIF           =
-FOREACH         = for %%f in (
-FORVAR          = %%f
-FORDO           = ) do
-ENDFOR          =
-ARGQUOTE        = "
-# "
-DQUOTE          = \"
-DEL             = rm
-DEL_TREE        = rm -r
-!ifdef NODEBUG
-DEBUG_FLAG =
-DEBUG_LINK =
-D =
-!else
-DEBUG_FLAG = -Zi
-DEBUG_LINK = -debug
-D = d
-!endif
-# gcc-specific pragma (ignore for MSVC)
-PRAGMA_SYSTEM_HEADER =
-!if "$(ARCH)" == "i386"
-!ifdef NOOPT
-#ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zl -Zp8 -W2 -Od -Gd $(DEBUG_FLAG)
-!else
-#ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG)
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zl -Zp8 -W2 -Oi -Ot -Oy- -Ob2 -GF -Gy -Gd $(DEBUG_FLAG)
-!endif
-ARCH_LDFLAGS    = $(SYS_LDFLAGS)
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-x86.manifest
-!else
-!if "$(ARCH)" == "mips"
-ARCH_CFLAGS     = -D_MIPS_=1 -c -W2 -Zi -Od -Gt0
-ARCH_LDFLAGS    = $(SYS_LDFLAGS)
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-mips.manifest
-!else
-!if "$(ARCH)" == "alpha"
-!if "$(BUILD_TYPE)" == "spd"
-ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -Od -D__stdcall= -D__cdecl=
-!else
-ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -O1 -D__stdcall= -D__cdecl=
-!endif
-ARCH_LDFLAGS    = $(SYS_LDFLAGS)
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-alpha.manifest
-!else
-!if "$(ARCH)" == "ppc"
-# These flags are a guess...if they don't work, please send me mail.
-ARCH_LDFLAGS    = $(SYS_LDFLAGS)
-EMACS_HEAPSIZE  = 27
-EMACS_PURESIZE  = 5000000
-EMACS_MANIFEST  = emacs-ppc.manifest
-!else
-!if "$(ARCH)" == "AMD64"
-!ifdef NOOPT
-ARCH_CFLAGS     = -nologo -D_AMD64_=1 -DWIN64 -D_WIN64 -DWIN32 -D_WIN32 -c -Zl -Zp8 -W2 -Od -Gd -Wp64 $(DEBUG_FLAG)
-!else
-ARCH_CFLAGS     = -nologo -D_AMD64_=1 -DWIN64 -D_WIN64 -DWIN32 -D_WIN32 -c -Zl -Zp8 -W2 -O2x -GF -Gy -Gd $(DEBUG_FLAG)
-!endif
-ARCH_LDFLAGS    = $(SYS_LDFLAGS) -machine:x64
-ARCH_RCFLAGS    = -DWIN64
-EMACS_HEAPSIZE  = 42
-EMACS_PURESIZE  = 10000000
-EMACS_MANIFEST  = emacs-x64.manifest
-!else
-!ERROR Unknown architecture type "$(ARCH)".
-!endif
-!endif
-!endif
-!endif
-!endif
-LINK_FLAGS      = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(USER_LDFLAGS)
-# From MSVC 5.0 onwards, it seem base relocation information is not included,
-# at least in release builds.  We need to ensure the reloc info is included
-# in order to use the MSVC profiler.
-!IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)")
-EXTRA_LINK      =
-!ELSE
-EXTRA_LINK      = -profile
-!ENDIF
-#
-# If the compiler supports compiling multiple .c files to .o files at
-# one time, use this feature.
-#
-!IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)")
-.c{$(BLD)}.obj:
-                $(CC) $(CFLAGS) -Fo$(BLD)\ $<
-!ELSE
-.c{$(BLD)}.obj::
-                $(CC) $(CFLAGS) -Fo$(BLD)\ $<
-!ENDIF
diff --git a/nt/paths.h b/nt/paths.h
deleted file mode 100644
index d6dfaad8f4e..00000000000
--- a/nt/paths.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* paths.h file for MS Windows
-Copyright (C) 1993, 1995, 1997, 1999, 2001-2015 Free Software
-Foundation, Inc.
-This file is part of GNU Emacs.
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-/* Relative file names in this file that begin with "%emacs_dir%/" are
-   treated specially by decode_env_path: they are expanded relative to
-   the value of the emacs_dir environment variable, which points to
-   the root of the Emacs tree.  */
-/* The default search path for Lisp function "load".
-   Together with PATH_SITELOADSEARCH, this sets load-path.  */
-/* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */
-#define PATH_LOADSEARCH "%emacs_dir%/lisp"
-/* Like PATH_LOADSEARCH, but contains the non-standard pieces.  */
-#define PATH_SITELOADSEARCH "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp"
-/* Like PATH_LOADSEARCH, but used only when Emacs is dumping.  This
-   path is usually identical to PATH_LOADSEARCH except that the entry
-   for the directory containing the installed lisp files has been
-   replaced with ../lisp.  */
-#define PATH_DUMPLOADSEARCH "../lisp"
-/* The extra search path for programs to invoke.  This is appended to
-   whatever the PATH environment variable says to set the Lisp
-   variable exec-path and the first file name in it sets the Lisp
-   variable exec-directory.  exec-directory is used for finding
-   executables and other architecture-dependent files.  */
-/* #define PATH_EXEC "/usr/local/lib/emacs/etc" */
-#define PATH_EXEC "%emacs_dir%/bin;%emacs_dir%/lib-src/oo-spd/i386;%emacs_dir%/lib-src/oo/i386;%emacs_dir%/nt/oo-spd/i386;%emacs_dir%/nt/oo/i386"
-/* Where Emacs should look for its architecture-independent data
-   files, like the NEWS file.  The lisp variable data-directory
-   is set to this value.  */
-/* #define PATH_DATA "/usr/local/lib/emacs/data" */
-#define PATH_DATA "%emacs_dir%/etc"
-/* Where Emacs should look for X bitmap files.
-   The lisp variable x-bitmap-file-path is set based on this value.  */
-#define PATH_BITMAPS ""
-/* Where Emacs should look for its docstring file.  The lisp variable
-   doc-directory is set to this value.  */
-#define PATH_DOC "%emacs_dir%/etc"
-/* Where the configuration process believes the info tree lives.  The
-   lisp variable configure-info-directory gets its value from this
-   macro, and is then used to set the Info-default-directory-list.  */
-/* #define PATH_INFO "/usr/local/info" */
-#define PATH_INFO "C:/emacs/info"
author	Eli Zaretskii	2015-08-15 10:56:51 +0300
committer	Eli Zaretskii	2015-08-15 10:56:51 +0300
commit	8db2b2a7d3fc3e4475bc4137c11069a69a3234ec (patch)
tree	9c3141edc2818d2e2909f2ad89a9620a0ec45937 /nt
parent	8fa49a6786bd71aa91b1e82709bc1852a65c4646 (diff)
download	emacs-8db2b2a7d3fc3e4475bc4137c11069a69a3234ec.tar.gz emacs-8db2b2a7d3fc3e4475bc4137c11069a69a3234ec.zip