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.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f618a1e6fab09da851d24303717ef6321ad61540..857d3600f1ab0322b29cc227a319064e8be95a93 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-11  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using
+       autoconf, not cpp.
+       (ALL_CFLAGS): Use them as make variables.
+
 2010-04-07  Christoph  <cschol2112@googlemail.com>  (tiny change)
 
        * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1e3d68680738edc713ec7b48f20896c003296878..43f934a9ccda727ee90c1ec607dc6c3cbc9066eb 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -34,6 +34,8 @@ CFLAGS=@CFLAGS@
 version=@version@
 configuration=@configuration@
 EXEEXT=@EXEEXT@
+C_SWITCH_SYSTEM=@c_switch_system@
+C_SWITCH_MACHINE=@c_switch_machine@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -168,14 +170,6 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRL
 #define LIBS_MACHINE
 #endif
 
-#ifndef C_SWITCH_SYSTEM
-#define C_SWITCH_SYSTEM
-#endif
-
-#ifndef C_SWITCH_MACHINE
-#define C_SWITCH_MACHINE
-#endif
-
 #undef MOVEMAIL_NEEDS_BLESSING
 #ifndef MAIL_USE_FLOCK
 #ifndef MAIL_USE_LOCKF
@@ -194,11 +188,11 @@ LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
 /* Those files shared with other GNU utilities need HAVE_CONFIG_H
    defined before they know they can take advantage of the information
    in ../src/config.h.  */
-ALL_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
+ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
+LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
-CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
+CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
 \f
 .SUFFIXES: .m

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index f0f9c34519e06bc9dc3c3abd497310a4ad758350..a0a08827e9c9f88011c5a7b1b7a7d63b2276c250 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/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-04-11  Jan Djärv  <jan.h.d@swipnet.se>
 
        * lwlib-Xaw.c (widget_xft_data): New for Xft data.

diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 5645481d1581b524bc3059a2b2ed34a0a2c6f688..c79292ea59c773355eeb57e0c83fd33a1773a4eb 100644 (file)
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -26,6 +26,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@
 
 CC=@CC@
 CFLAGS=@CFLAGS@

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index e39f931e6e4aaca116133d26f38af25cdd73483c..1dd1e1bdd9a1c4763f9ccc3174df9b0af063a6a6 100644 (file)
--- 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 a4a2d52b156c3169abd51d92692707348c625dff..2e253ab57140c8a568866a32357aeee2221627b3 100644 (file)
--- 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@