Reduce CPP usage.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE, C_SWITCH_X_SITE): Remove
definitions and undefs.  Inline definitions in the only user.
(ALL_CFLAGS): Substitute C_SWITCH_X_SYSTEM using autoconf.

* Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.

* Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.

* configure.in (C_SWITCH_X_SYSTEM): Define using autoconf, not cpp.

2 files changed, 5 insertions, 0 deletions

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 48e7a30020e..49569e5f79b 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.
+
 2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused.
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index b729f34ee93..52c6fe97428 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -46,6 +46,7 @@
 srcdir=@srcdir@
 VPATH=@srcdir@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
+C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@
 C_SWITCH_SYSTEM=@c_switch_system@
 C_SWITCH_MACHINE=@c_switch_machine@