From: Kenichi Handa <handa@etlken>
Date: Fri, 14 May 2010 03:52:21 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=508197067c434b0111bcb6ded742d424bb738ece;p=emacs.git

merge trunk
---

508197067c434b0111bcb6ded742d424bb738ece
diff --cc src/ChangeLog
index f759d0cebcd,24ec0650d06..7ffb5800753
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,51 +1,56 @@@
 +2010-05-14  Kenichi Handa  <handa@m17n.org>
 +
 +	* font.c (font_range): Return the range for the font found at
 +	first.
 +
+ 2010-05-14  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* Makefile.in (mktime, X11, register): Move undefs to configure.
+ 
+ 	* Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it.
+ 	(MSDOS_X_OBJ): New variable.
+ 	(MSDOS_SUPPORT_REAL): New constant.
+ 	(MSDOS_SUPPORT): Set as a variable, not with cpp.
+ 	(obj): Use MSDOS_X_OBJ.
+ 	(lisp): Use MSDOS_SUPPORT as a variable.
+ 
+ 	* Makefile.in (REAL_MOUSE_SUPPORT): New constant.
+ 	(GPM_MOUSE_SUPPORT): Now it's a constant.
+ 	(MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): Set with configure,
+ 	not cpp.
+ 
+ 	* Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef.
+ 	(ns_appresdir): Remove, unused.
+ 
+ 	* Makefile.in (SHELL): Move outside cpp section.
+ 
+ 	* s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM).
+ 
+ 2010-05-13  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff.
+ 	(TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff.
+ 
+ 	* Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
+ 	HAVE_WINDOW_SYSTEM must be too.
+ 
+ 	* Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file.
+ 	(lisp): Remove WINNT_SUPPORT.
+ 
+ 	* Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
+ 	Let configure set these variables (to empty) in this case as well.
+ 
+ 	* Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp.
+ 	(LIBX_BASE): Use $LD_SWITCH_X_SITE.
+ 
+ 	* Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
+ 	(LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
+ 	(FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
+ 	(M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM)
+ 	(LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold
+ 	the values output by configure.
+ 	(ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables.
+ 
  2010-05-12  Glenn Morris  <rgm@gnu.org>
  
  	* Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic.