[Emacs-diffs] /srv/bzr/emacs/trunk r99877: Change so emacs at least compiles.

[Jan D.]

------------------------------------------------------------
revno: 99877
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-12 12:59:35 +0200
message:
  Change so emacs at least compiles.
  
  #undef C_SWITCH_MACHINE
  #undef C_SWITCH_SYSTEM
  #undef C_SWITCH_X_SITE
modified:
  src/Makefile.in

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-11 21:43:28 +0000
+++ b/src/Makefile.in   2010-04-12 10:59:35 +0000
@@ -250,9 +250,13 @@
    -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 ${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) ${CFLAGS_SOUND} 
${RSVG_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