Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-57
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-58
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-59
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-60
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-62
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-63
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-64
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-65
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-66
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-67
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-68
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-69
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-71

3 files changed, 8 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4a51c1ab4ee..91fb3f510c1 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,12 +1,16 @@
+2004-01-28  Peter Runestig  <peter@runestig.com>
+
+        * gmake.defs, nmake.defs: Add linking to ``winspool.lib''.
+
 2003-12-24  Miles Bader  <miles@gnu.ai.mit.edu>
 
         * .cvsignore: Add `.arch-inventory'.
 
-2003-11-22  Lars Hansen <larsh@math.ku.dk>
+2003-11-22  Lars Hansen  <larsh@math.ku.dk>
 
         * inc/grp.h: Added.
 
-2003-09-03  Peter Runestig <peter@runestig.com>
+2003-09-03  Peter Runestig  <peter@runestig.com>
 
         * configure.bat: Create ``makefile'' in directories man, lispref
         and lispintro.
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 0bf3f48dd6e..7fe580426a8 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -177,6 +177,7 @@ SHELL32		= -lshell32
 USER32          = -luser32
 WSOCK32         = -lwsock32
 WINMM     = -lwinmm
+WINSPOOL        = -lwinspool
 
 ifdef NOOPT
 DEBUG_CFLAGS    = -DEMACSDEBUG
diff --git a/nt/nmake.defs b/nt/nmake.defs
index f18b9e06405..aef2b6cf472 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -124,6 +124,7 @@ SHELL32		= shell32.lib
 USER32          = user32.lib

 WSOCK32         = wsock32.lib

 WINMM     = winmm.lib

+WINSPOOL        = winspool.lib

 

 !ifdef NOOPT

 DEBUG_CFLAGS    = -DEMACSDEBUG