aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-05-05 13:06:04 +0300
committerEli Zaretskii2014-05-05 13:06:04 +0300
commit9db5046c106f5bf6ceb79949b7b089809f099b42 (patch)
treeb4d21f5b201e9eb9ae87327b2d098cc289c29726
parent80e377c0d02bcacd636465ff1a169cf4ebafeec3 (diff)
downloademacs-9db5046c106f5bf6ceb79949b7b089809f099b42.tar.gz
emacs-9db5046c106f5bf6ceb79949b7b089809f099b42.zip
Update nt/INSTALL for the latest changes in configury.
nt/INSTALL: Update to the effect that pkg-config is now required for building from the repository.
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/INSTALL17
2 files changed, 17 insertions, 5 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index f31d2619319..16d3e5f3972 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12014-05-05 Eli Zaretskii <eliz@gnu.org>
2
3 * INSTALL: Update to the effect that pkg-config is now required
4 for building from the repository.
5
12014-04-30 Eli Zaretskii <eliz@gnu.org> 62014-04-30 Eli Zaretskii <eliz@gnu.org>
2 7
3 * cmdproxy.c (make_absolute): Don't copy more characters from PATH 8 * cmdproxy.c (make_absolute): Don't copy more characters from PATH
diff --git a/nt/INSTALL b/nt/INSTALL
index 1fe00a37d97..a52bdd8f086 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -115,6 +115,11 @@ Windows 9X as well).
115 MSYS Texinfo, after installing it as part of msys-base, invoke the 115 MSYS Texinfo, after installing it as part of msys-base, invoke the
116 command "mingw-get remove msys-texinfo".) 116 command "mingw-get remove msys-texinfo".)
117 117
118 In addition, building Emacs from the development repository requires
119 pkg-config to be installed. As the MinGW project does not offer it,
120 you will have to install it from elsewhere; see below (search for
121 "pkg-config").
122
118 At this point, you should be ready to configure and build Emacs in 123 At this point, you should be ready to configure and build Emacs in
119 its basic configuration. Skip to the "Generating the configure 124 its basic configuration. Skip to the "Generating the configure
120 script" section for the build instructions. If you want to build it 125 script" section for the build instructions. If you want to build it
@@ -173,14 +178,16 @@ Windows 9X as well).
173 178
174 Available from http://sourceforge.net/projects/ezwinports/files/. 179 Available from http://sourceforge.net/projects/ezwinports/files/.
175 180
176 . gzip (needed to compress files during "make install") 181 . pkg-config (invoked by the configure script to look for optional
182 packages; _required_ for building from the development
183 repository, as some components of pkg-config are needed to run
184 the autoconf and aclocal scripts)
177 185
178 Available from http://gnuwin32.sourceforge.net/packages/gzip.htm. 186 Available from http://www.gtk.org/download/win32.php
179 187
180 . pkg-config (needed for building with some optional libraries, 188 . gzip (needed to compress files during "make install")
181 such as GnuTLS and libxml2)
182 189
183 Available from http://www.gtk.org/download/win32.php 190 Available from http://gnuwin32.sourceforge.net/packages/gzip.htm.
184 191
185 Each package might list other packages as prerequisites on its 192 Each package might list other packages as prerequisites on its
186 download page (under "Runtime requirements"); download those as 193 download page (under "Runtime requirements"); download those as