Move LIBXTR6 from cpp to autoconf.

* configure.in (LIBXTR6): New output variable.  Move unixware special
case here from src/s/unixware.h.

* src/Makefile.in (LIBXTR6): Set with configure, not cpp.
* src/s/unixware.h (NEED_LIBW): Remove definition.

* admin/CPP-DEFINES: Remove NEED_LIBW.

1 files changed, 2 insertions, 8 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 9c55ebbb96b..9e505741524 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -88,6 +88,8 @@ GTK_OBJ=@GTK_OBJ@
 
 LIBXSM=@LIBXSM@
 
+LIBXTR6=@LIBXTR6@
+
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
@@ -256,14 +258,6 @@ LIBXMENU=
 #ifdef USE_X_TOOLKIT
 LIBW=$(TOOLKIT_LIBW)
 
-#ifdef HAVE_X11XTR6
-#ifdef NEED_LIBW
-LIBXTR6 = -lSM -lICE -lw
-#else
-LIBXTR6 = -lSM -lICE
-#endif
-#endif
-
 #ifndef LIBXMU
 #define LIBXMU -lXmu
 #endif