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.

3 files changed, 5 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cb9fefea39b..98a93855adc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-27  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (LIBXTR6): Set with configure, not cpp.
+        * s/unixware.h (NEED_LIBW): Remove definition.
+
         * Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
         (TOOLKIT_LIBW): New, set by configure.
         (@X_TOOLKIT_TYPE@): No longer define it.
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
diff --git a/src/s/unixware.h b/src/s/unixware.h
index d019b8bba80..d1e8748d913 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -56,9 +56,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     pty_name[sizeof(pty_name) - 1] = 0;         \
   }
 
-/* Use libw.a along with X11R6 Xt.  */
-#define NEED_LIBW
-
 /* Data type of load average, as read out of kmem.  */
 
 #define LOAD_AVE_TYPE long