Mercurial > emacs

diff src/ChangeLog @ 108458:30b11e5df204

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Wed, 28 Apr 2010 12:11:11 +0000
parents ad916afa5bdd
children 514ebf69b289
line wrap: on
line diff
--- a/src/ChangeLog	Tue Apr 27 12:24:59 2010 +0000
+++ b/src/ChangeLog	Wed Apr 28 12:11:11 2010 +0000
@@ -1,3 +1,25 @@
+2010-04-28  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables.
+	(WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them.
+
+	* Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
+
+	* Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
+	(MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT.
+
+	* Makefile.in (FONT_OBJ): New, set by configure.
+	(FONT_DRIVERS): Use $FONT_OBJ.
+
+	* Makefile.in (LIBXMU): Set with configure, not cpp.
+	* s/aix4-2.h (LIBXMU):
+	* s/hpux10-20.h (LIBXMU):
+	Remove definition, now set in configure.
+
+	* Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
+
+	* m/amdx86-64.h [i386]: Move this test to configure.in.
+
 2010-04-27  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (LIBXTR6): Set with configure, not cpp.