Mercurial > emacs

diff src/Makefile.in @ 108136:43dcbd8381dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Glenn Morris <rgm@gnu.org>
date Tue, 27 Apr 2010 01:09:01 -0700
parents 236318fbe135
children 40b36ac1946f
line wrap: on
line diff
--- a/src/Makefile.in	Tue Apr 27 00:38:05 2010 -0700
+++ b/src/Makefile.in	Tue Apr 27 01:09:01 2010 -0700
@@ -88,6 +88,8 @@
 
 LIBXSM=@LIBXSM@
 
+LIBXTR6=@LIBXTR6@
+
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
@@ -256,14 +258,6 @@
 #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