Commit 8fdac2c3 authored by Glenn Morris's avatar Glenn Morris

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.
parent c82a7244
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.
......
......@@ -250,7 +250,6 @@ MODE_LINE_BINARY_TEXT
MUST_UNDEF__STDC__
NEED_BSDTTY
NEED_ERRNO
NEED_LIBW
NEED_UNISTD_H
NLIST_STRUCT
NOT_C_CODE
......
......@@ -1833,6 +1833,7 @@ fi
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,
......@@ -1846,6 +1847,11 @@ fail;
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
......@@ -1861,6 +1867,7 @@ dnl tranle@intellicorp.com says libXmu.a can need XtMalloc in libXt.a to link.
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.
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment