From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 12 Apr 2010 11:28:56 +0000 (+0200)
Subject: Restore C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~536
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e18006e5c8aa7a00283bc1aae7657883f50650c0;p=emacs.git

Restore C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index afb62b96290..25ad5f0911f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -256,7 +256,7 @@ GCONF_LIBS = @GCONF_LIBS@
 
 /* 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) ${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} ${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