From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Apr 2010 09:20:03 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~511^2~55
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=998fc3676243277f3b1c73eb91c055c80a7498c7;p=emacs.git

merge from trunk
---

998fc3676243277f3b1c73eb91c055c80a7498c7
diff --cc src/Makefile.in
index 2d68910667f,0862aa94725..dada7164761
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -268,11 -254,13 +255,13 @@@ DBUS_OBJ = dbusbind.
     -DHAVE_CONFIG_H is needed for some other files to take advantage of
     the information in ``config.h''.  */
  
+ #undef C_SWITCH_MACHINE
+ #undef C_SWITCH_SYSTEM
+ #undef C_SWITCH_X_SITE
+ 
  /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
     since it may have -I options that should override those two.  */
- 
- ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${IMAGEMAGICK_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
- 
 -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
++ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${IMAGEMAGICK_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
  ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
  
  .SUFFIXES: .m