Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)

Patches applied:

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-248
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-60
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-62
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-63
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
   (mm-string-to-multibyte): Use Gnus trunk definition.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-65
   Update from CVS

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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 53725361a80..ec5ff5a4c5f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -686,6 +686,12 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
 #define WINNT_SUPPORT
 #endif
 
+#ifdef HAVE_WINDOW_SYSTEM
+#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc
+#else
+#define TOOLTIP_SUPPORT
+#endif
+
 /* List of Lisp files loaded into the dumped Emacs.  It's arranged
    like this because it's easier to generate it semi-mechanically from
    loadup.el this way.
@@ -780,6 +786,7 @@ lisp= \
         ${lispsource}emacs-lisp/timer.elc \
         ${lispsource}vc-hooks.elc \
         ${lispsource}ediff-hook.elc \
+        TOOLTIP_SUPPORT \
         VMS_SUPPORT \
         MSDOS_SUPPORT \
         WINNT_SUPPORT \
@@ -887,6 +894,7 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \
   ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
   ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
   ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
+  ${dotdot}/lisp/tooltip.elc \
   ${dotdot}/lisp/international/ccl.elc \
   ${dotdot}/lisp/international/codepage.elc \
   ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \
@@ -1233,7 +1241,8 @@ abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
   fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \
   scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \
   xterm.o xselect.o sound.o: macgui.h
-mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h $(config_h)
+mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \
+  coding.h $(config_h)
 macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \
   dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \
   atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h)