Use autoconf, not cpp for some variables.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using
autoconf, not cpp.
(ALL_CFLAGS): Use them as make variables.

2 files changed, 7 insertions, 0 deletions

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index e39f931e6e4..1dd1e1bdd9a 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-11  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
+        (C_SWITCH_X_SITE): Define using autoconf.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * Branch for 23.2.
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index a4a2d52b156..2e253ab5714 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -46,6 +46,8 @@
 srcdir=@srcdir@
 VPATH=@srcdir@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
+C_SWITCH_SYSTEM=@c_switch_system@
+C_SWITCH_MACHINE=@c_switch_machine@
 
 EXTRA=insque.o
 CC=@CC@