Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.

* configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
(TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.

* src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
(TOOLKIT_LIBW): New, set by configure.
(@X_TOOLKIT_TYPE@): No longer define it.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 41d0fb414f7..cb9fefea39b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-27  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
+        (TOOLKIT_LIBW): New, set by configure.
+        (@X_TOOLKIT_TYPE@): No longer define it.
+
         * Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW.
         (MOTIF_LIBW): Set with configure, not cpp.
         * s/aix4-2.h (LIB_MOTIF):
diff --git a/src/Makefile.in b/src/Makefile.in
index 5b4426686d0..9c55ebbb96b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -91,8 +91,7 @@ LIBXSM=@LIBXSM@
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
-LUCID_LIBW=@LUCID_LIBW@
-MOTIF_LIBW=@MOTIF_LIBW@
+TOOLKIT_LIBW=@TOOLKIT_LIBW@
 
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
@@ -255,8 +254,7 @@ LIBXMENU=
 #endif /* not HAVE_MENUS */
 
 #ifdef USE_X_TOOLKIT
-# define @X_TOOLKIT_TYPE@
-LIBW=$(@X_TOOLKIT_TYPE@_LIBW)
+LIBW=$(TOOLKIT_LIBW)
 
 #ifdef HAVE_X11XTR6
 #ifdef NEED_LIBW