2010-04-27 Glenn Morris <rgm@gnu.org>
+ * configure.in (LIBXTR6): New output variable. Move unixware special
+ case here from src/s/unixware.h.
+
* configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute
in Makefiles.
(TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
MUST_UNDEF__STDC__
NEED_BSDTTY
NEED_ERRNO
-NEED_LIBW
NEED_UNISTD_H
NLIST_STRUCT
NOT_C_CODE
X_TOOLKIT_TYPE=$USE_X_TOOLKIT
+LIBXTR6=
if test "${USE_X_TOOLKIT}" != "none"; then
AC_MSG_CHECKING(X11 toolkit version)
AC_CACHE_VAL(emacs_cv_x11_toolkit_version_6,
AC_MSG_RESULT(6 or newer)
AC_DEFINE(HAVE_X11XTR6, 1,
[Define to 1 if you have the X11R6 or newer version of Xt.])
+ LIBXTR6="-lSM -lICE"
+ case "$opsys" in
+ ## Use libw.a along with X11R6 Xt.
+ unixware) LIBXTR6="$LIBXTR6 -lw" ;;
+ esac
else
AC_MSG_RESULT(before 6)
fi
AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
fi
+AC_SUBST(LIBXTR6)
# On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D.
if test "${HAVE_X11}" = "yes"; then
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.
LIBXSM=@LIBXSM@
+LIBXTR6=@LIBXTR6@
+
XMENU_OBJ=@XMENU_OBJ@
XOBJ=@XOBJ@
#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
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