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, 11 insertions, 11 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f618a1e6fab..857d3600f1a 100644
--- 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 1e3d6868073..43f934a9ccd 100644
--- 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}
 
 .SUFFIXES: .m