Replace some more cpp with autoconf.

* configure.in (LUCID_LIBW, LIBXP, WIDGET_OBJ): New output variables.

* src/Makefile.in (LIBXP, LUCID_LIBW, WIDGET_OBJ): Set via configure.
(MOTIF_LIBW): Use $LIBXP.
(otherobj): Use $WIDGET_OBJ.

2 files changed, 16 insertions, 21 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9807cd45f3a..1dbdf0fbae8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-27  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBXP, LUCID_LIBW, WIDGET_OBJ): Set via configure.
+        (MOTIF_LIBW): Use $LIBXP.
+        (otherobj): Use $WIDGET_OBJ.
+
 2010-04-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * Makefile.in (LIBS_MACHINE): Remove, unused.
diff --git a/src/Makefile.in b/src/Makefile.in
index 9b281e93448..adf4400a1da 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -92,17 +92,23 @@ GCONF_LIBS = @GCONF_LIBS@
 
 GTK_OBJ=@GTK_OBJ@
 
+LIBXP=@LIBXP@
 LIBXSM=@LIBXSM@
 
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
+LUCID_LIBW=@LUCID_LIBW@
+
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
 
 RSVG_LIBS= @RSVG_LIBS@
 RSVG_CFLAGS= @RSVG_CFLAGS@
 
+## widget.o if USE_X_TOOLKIT, otherwise empty.
+WIDGET_OBJ=@WIDGET_OBJ@
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -277,20 +283,10 @@ LIBXMENU=
 
 #ifdef USE_X_TOOLKIT
 # define @X_TOOLKIT_TYPE@
-# if HAVE_XAW3D
-LUCID_LIBW= -lXaw3d
-# else
-LUCID_LIBW= -lXaw
-# endif
-# if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP)
-#  define LIB_MOTIF_EXTRA -lXp
-# else
-#  define LIB_MOTIF_EXTRA
-# endif
 # ifdef LIB_MOTIF
-MOTIF_LIBW= LIB_MOTIF LIB_MOTIF_EXTRA
+MOTIF_LIBW= LIB_MOTIF $(LIBXP)
 # else
-MOTIF_LIBW= -lXm LIB_MOTIF_EXTRA
+MOTIF_LIBW= -lXm $(LIBXP)
 # endif
 LIBW=$(@X_TOOLKIT_TYPE@_LIBW)
 
@@ -490,20 +486,13 @@ mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o
 #endif /* SYSTEM_MALLOC */
 
 
-#ifdef USE_X_TOOLKIT
-widgetobj= widget.o
-#else /* not USE_X_TOOLKIT */
-widgetobj=
-#endif /* not USE_X_TOOLKIT */
-
-
 /* define otherobj as list of object files that make-docfile
    should not be told about.  */
 #ifdef CYGWIN
 /* Cygwin differs because of its unexec(). */
-otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(widgetobj) $(LIBOBJS)
+otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(WIDGET_OBJ) $(LIBOBJS)
 #else
-otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS)
+otherobj= $(termcapobj) lastfile.o $(mallocobj) $(WIDGET_OBJ) $(LIBOBJS)
 #endif
 
 #ifdef HAVE_MOUSE