# ------------------------------------------------------------------------------
# aclocal.m4 | 8
# charproc.c | 27 +-
# charsets.c | 386 ++++++++++++++++++++++++--------
# config.guess | 93 +++++--
# config.sub | 30 +-
# configure | 659 +++++++++++++++++++++++++++++++------------------------
# configure.in | 2
# input.c | 8
# main.c | 181 ++++++---------
# os2main.c | 10
# ptyx.h | 7
# screen.c | 19 -
# version.h | 2
# xterm.h | 3
# xterm.log.html | 14 +
# xterm.man | 10
# 16 files changed, 900 insertions, 559 deletions
# ------------------------------------------------------------------------------
Index: aclocal.m4
--- xterm-90+/aclocal.m4 Sun Oct 25 13:31:39 1998
+++ xterm-91/aclocal.m4 Wed Jan 20 05:52:42 1999
@@ -3,7 +3,7 @@
dnl
dnl ---------------------------------------------------------------------------
dnl
-dnl Copyright 1997,1998 by Thomas E. Dickey <dickey@clark.net>
+dnl Copyright 1997,1998,1999 by Thomas E. Dickey <dickey@clark.net>
dnl
dnl All Rights Reserved
dnl
@@ -618,11 +618,11 @@
AC_CHECK_HEADERS(X11/$cf_x_athena/SimpleMenu.h)
-AC_CHECK_LIB(Xmu, XmuClientWindow,,[
-AC_CHECK_LIB(Xmu_s, XmuClientWindow)])
-
AC_CHECK_LIB(Xext,XextCreateExtension,
[LIBS="-lXext $LIBS"])
+
+AC_CHECK_LIB(Xmu, XmuClientWindow,,[
+AC_CHECK_LIB(Xmu_s, XmuClientWindow)])
AC_CHECK_LIB($cf_x_athena, XawSimpleMenuAddGlobalActions,
[LIBS="-l$cf_x_athena $LIBS"],[
Index: charproc.c
--- xterm-90+/charproc.c Sun Dec 20 22:50:38 1998
+++ xterm-91/charproc.c Thu Jan 21 06:47:27 1999
@@ -333,7 +333,6 @@
*/
/* Defaults */
-#define DFT_KBD_DIALECT "B"
#if OPT_ISO_COLORS
static Boolean defaultCOLORMODE = DFT_COLORMODE;
#endif
@@ -346,7 +345,6 @@
static int defaultNMarginBell = N_MARGINBELL;
static int defaultMultiClickTime = MULTICLICKTIME;
static int defaultBellSuppressTime = BELLSUPPRESSMSEC;
-static int default_DECID = DFT_DECID;
static char * _Font_Selected_ = "yes"; /* string is arbitrary */
#if OPT_BLINK_CURS
@@ -805,9 +803,9 @@
{XtNunderLine, XtCUnderLine, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.underline),
XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNdecTerminalID, XtCDecTerminalID, XtRInt, sizeof(int),
- XtOffsetOf(XtermWidgetRec, screen.terminal_id),
- XtRInt, (XtPointer) &default_DECID},
+{XtNdecTerminalID, XtCDecTerminalID, XtRString, sizeof(String),
+ XtOffsetOf(XtermWidgetRec, screen.term_id),
+ XtRString, (XtPointer) DFT_DECID},
#ifndef NO_ACTIVE_ICON
{"activeIcon", "ActiveIcon", XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, misc.active_icon),
@@ -982,7 +980,6 @@
void resetCharsets(TScreen *screen)
{
screen->gsets[0] = 'B'; /* ASCII_G */
- screen->gsets[0] = screen->keyboard_dialect[0]; /* e.g., ASCII_G */
screen->gsets[1] = '0'; /* line drawing */
screen->gsets[2] = 'B'; /* DEC supplemental. */
screen->gsets[3] = 'B';
@@ -1815,6 +1812,7 @@
break;
case CASE_GSETS:
+ TRACE(("CASE_GSETS(%d) = '%c'\n", scstype, c))
screen->gsets[scstype] = c;
parsestate = groundtable;
break;
@@ -2486,7 +2484,7 @@
register int n;
register int next_col;
- if (!xtermCharSets(buf, ptr, charset))
+ if (!xtermCharSetOut(buf, ptr, charset))
return;
if_OPT_XMC_GLITCH(screen,{
@@ -3678,6 +3676,7 @@
#if OPT_ISO_COLORS
Boolean color_ok;
#endif
+ char *s;
/* Zero out the entire "screen" component of "wnew" widget, then do
* field-by-field assigment of "screen" fields that are named in the
@@ -3747,11 +3746,21 @@
wnew->screen.scrolllines = request->screen.scrolllines;
wnew->screen.scrollttyoutput = request->screen.scrollttyoutput;
wnew->screen.scrollkey = request->screen.scrollkey;
- wnew->screen.terminal_id = request->screen.terminal_id;
+
+ wnew->screen.term_id = request->screen.term_id;
+ for (s = request->screen.term_id; *s; s++) {
+ if (!isalpha(*s))
+ break;
+ }
+ wnew->screen.terminal_id = atoi(s);
if (wnew->screen.terminal_id < MIN_DECID)
wnew->screen.terminal_id = MIN_DECID;
if (wnew->screen.terminal_id > MAX_DECID)
wnew->screen.terminal_id = MAX_DECID;
+ TRACE(("term_id '%s' -> terminal_id %d\n",
+ wnet->screen.term_id,
+ wnet->screen.terminal_id))
+
wnew->screen.ansi_level = (wnew->screen.terminal_id / 100);
wnew->screen.visualbell = request->screen.visualbell;
#if OPT_TEK4014
@@ -3778,7 +3787,9 @@
wnew->screen.print_attributes = request->screen.print_attributes;
#endif
+ TRACE(("keyboard_dialect:%s\n", request->screen.keyboard_dialect))
wnew->screen.keyboard_dialect = request->screen.keyboard_dialect;
+
wnew->screen.input_eight_bits = request->screen.input_eight_bits;
wnew->screen.output_eight_bits = request->screen.output_eight_bits;
wnew->screen.control_eight_bits = request->screen.control_eight_bits;
Index: charsets.c
--- xterm-90+/charsets.c Sun Oct 25 13:31:39 1998
+++ xterm-91/charsets.c Thu Jan 21 05:37:42 1999
@@ -4,7 +4,7 @@
/************************************************************
-Copyright 1998 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1998, 1999 by Thomas E. Dickey <dickey@clark.net>
All Rights Reserved
@@ -37,6 +37,8 @@
#include <xterm.h>
#include <data.h>
+#include <X11/keysym.h>
+
/*
* This module performs translation as needed to support the DEC VT220 national
* replacement character sets. We assume that xterm's font is based on the ISO
@@ -54,14 +56,202 @@
*
* The latter reference, though easier to read, has a few errors and omissions.
*/
-int xtermCharSets(Char *buf, Char *ptr, char leftset)
+
+/*
+ * Translate an input keysym to the corresponding NRC keysym.
+ */
+unsigned xtermCharSetIn(unsigned code, int charset)
+{
+ if (code >= 128 && code < 256) {
+ switch (charset) {
+ case 'A': /* United Kingdom set (or Latin 1) */
+ if (code == XK_sterling)
+ code = '#';
+ code &= 0x7f;
+ break;
+
+#if OPT_XMC_GLITCH
+ case '?':
+#endif
+ case '1': /* Alternate Character ROM standard characters */
+ case '2': /* Alternate Character ROM special graphics */
+ case 'B': /* ASCII set */
+ break;
+
+ case '0': /* special graphics (line drawing) */
+ break;
+
+ case '4': /* Dutch */
+ switch (code) {
+ case XK_sterling: code = '#'; break;
+ case XK_threequarters: code = '@'; break;
+ case XK_ydiaeresis: code = 0x5b; break;
+ case XK_onehalf: code = 0x5c; break;
+ /* N/A case '|': code = 0x5d; break; */
+ case XK_diaeresis: code = 0x7b; break;
+ /* N/A case 'f': code = 0x7c; break; */
+ case XK_onequarter: code = 0x7d; break;
+ case XK_acute: code = 0x7e; break;
+ }
+ break;
+
+ case 'C':
+ case '5': /* Finnish */
+ switch (code) {
+ case XK_Adiaeresis: code = 0x5b; break;
+ case XK_Odiaeresis: code = 0x5c; break;
+ case XK_Aring: code = 0x5d; break;
+ case XK_Udiaeresis: code = 0x5e; break;
+ case XK_eacute: code = 0x60; break;
+ case XK_adiaeresis: code = 0x7b; break;
+ case XK_odiaeresis: code = 0x7c; break;
+ case XK_aring: code = 0x7d; break;
+ case XK_udiaeresis: code = 0x7e; break;
+ }
+ break;
+
+ case 'R': /* French */
+ switch (code) {
+ case XK_sterling: code = '#'; break;
+ case XK_agrave: code = '@'; break;
+ case XK_degree: code = 0x5b; break;
+ case XK_ccedilla: code = 0x5c; break;
+ case XK_section: code = 0x5d; break;
+ case XK_eacute: code = 0x7b; break;
+ case XK_ugrave: code = 0x7c; break;
+ case XK_egrave: code = 0x7d; break;
+ case XK_diaeresis: code = 0x7e; break;
+ }
+ break;
+
+ case 'Q': /* French Canadian */
+ switch (code) {
+ case XK_agrave: code = '@'; break;
+ case XK_acircumflex: code = 0x5b; break;
+ case XK_ccedilla: code = 0x5c; break;
+ case XK_ecircumflex: code = 0x5d; break;
+ case XK_icircumflex: code = 0x5e; break;
+ case XK_ocircumflex: code = 0x60; break;
+ case XK_eacute: code = 0x7b; break;
+ case XK_ugrave: code = 0x7c; break;
+ case XK_egrave: code = 0x7d; break;
+ case XK_ucircumflex: code = 0x7e; break;
+ }
+ break;
+
+ case 'K': /* German */
+ switch (code) {
+ case XK_section: code = '@'; break;
+ case XK_Adiaeresis: code = 0x5b; break;
+ case XK_Odiaeresis: code = 0x5c; break;
+ case XK_Udiaeresis: code = 0x5d; break;
+ case XK_adiaeresis: code = 0x7b; break;
+ case XK_odiaeresis: code = 0x7c; break;
+ case XK_udiaeresis: code = 0x7d; break;
+ case XK_ssharp: code = 0x7e; break;
+ }
+ break;
+
+ case 'Y': /* Italian */
+ switch (code) {
+ case XK_sterling: code = '#'; break;
+ case XK_section: code = '@'; break;
+ case XK_degree: code = 0x5b; break;
+ case XK_ccedilla: code = 0x5c; break;
+ case XK_eacute: code = 0x5d; break;
+ case XK_ugrave: code = 0x60; break;
+ case XK_agrave: code = 0x7b; break;
+ case XK_ograve: code = 0x7c; break;
+ case XK_egrave: code = 0x7d; break;
+ case XK_igrave: code = 0x7e; break;
+ }
+ break;
+
+ case 'E':
+ case '6': /* Norwegian/Danish */
+ switch (code) {
+ case XK_Adiaeresis: code = '@'; break;
+ case XK_AE: code = 0x5b; break;
+ case XK_Ooblique: code = 0x5c; break;
+ case XK_Aring: code = 0x5d; break;
+ case XK_Udiaeresis: code = 0x5e; break;
+ case XK_adiaeresis: code = 0x60; break;
+ case XK_ae: code = 0x7b; break;
+ case XK_oslash: code = 0x7c; break;
+ case XK_aring: code = 0x7d; break;
+ case XK_udiaeresis: code = 0x7e; break;
+ }
+ break;
+
+ case 'Z': /* Spanish */
+ switch (code) {
+ case XK_sterling: code = '#'; break;
+ case XK_section: code = '@'; break;
+ case XK_exclamdown: code = 0x5b; break;
+ case XK_Ntilde: code = 0x5c; break;
+ case XK_questiondown: code = 0x5d; break;
+ case XK_degree: code = 0x7b; break;
+ case XK_ntilde: code = 0x7c; break;
+ case XK_ccedilla: code = 0x7d; break;
+ }
+ break;
+
+ case 'H':
+ case '7': /* Swedish */
+ switch (code) {
+ case XK_Eacute: code = '@'; break;
+ case XK_Adiaeresis: code = 0x5b; break;
+ case XK_Odiaeresis: code = 0x5c; break;
+ case XK_Aring: code = 0x5d; break;
+ case XK_Udiaeresis: code = 0x5e; break;
+ case XK_eacute: code = 0x60; break;
+ case XK_adiaeresis: code = 0x7b; break;
+ case XK_odiaeresis: code = 0x7c; break;
+ case XK_aring: code = 0x7d; break;
+ case XK_udiaeresis: code = 0x7e; break;
+ }
+ break;
+
+ case '=': /* Swiss */
+ switch (code) {
+ case XK_ugrave: code = '#'; break;
+ case XK_agrave: code = '@'; break;
+ case XK_eacute: code = 0x5b; break;
+ case XK_ccedilla: code = 0x5c; break;
+ case XK_ecircumflex: code = 0x5d; break;
+ case XK_icircumflex: code = 0x5e; break;
+ case XK_egrave: code = 0x5f; break;
+ case XK_ocircumflex: code = 0x60; break;
+ case XK_adiaeresis: code = 0x7b; break;
+ case XK_odiaeresis: code = 0x7c; break;
+ case XK_udiaeresis: code = 0x7d; break;
+ case XK_ucircumflex: code = 0x7e; break;
+ }
+ break;
+
+ default: /* any character sets we don't recognize*/
+ break;
+ }
+ code &= 0x7f; /* NRC in any case is 7-bit */
+ }
+ return code;
+}
+
+/*
+ * Translate a string to the display form. This assumes the font has the
+ * DEC graphic characters in cells 0-31, and otherwise is ISO-8859-1.
+ */
+int xtermCharSetOut(Char *buf, Char *ptr, char leftset)
{
Char *s;
register TScreen *screen = &term->screen;
int count = 0;
int rightset = screen->gsets[(int)(screen->curgr)];
- TRACE(("CHARSET %c/%c %.*s\n", leftset, rightset, ptr-buf, buf))
+ TRACE(("CHARSET GL=%c(G%d) GR=%c(G%d) %.*s\n",
+ leftset, screen->curss ? screen->curss : screen->curgl,
+ rightset, screen->curgr,
+ ptr-buf, buf))
for (s=buf; s<ptr; ++s) {
int cs = (*s >= 128) ? rightset : leftset;
@@ -89,154 +279,154 @@
case '0': /* special graphics (line drawing) */
if (*s>=0x5f && *s<=0x7e)
- *s = *s == 0x5f ? 0x7f : *s - 0x5f;
+ *s = (*s == 0x5f) ? 0x7f : *s - 0x5f;
break;
case '4': /* Dutch */
switch (*s &= 0x7f) {
- case '#': *s = 0x1e; break;
- case '@': *s = 0xbe; break;
- case 0x5b: *s = 0xff; break;
- case 0x5c: *s = 0xbd; break;
+ case '#': *s = XK_sterling; break;
+ case '@': *s = XK_threequarters; break;
+ case 0x5b: *s = XK_ydiaeresis; break;
+ case 0x5c: *s = XK_onehalf; break;
case 0x5d: *s = '|'; break;
- case 0x7b: *s = 0xa8; break;
+ case 0x7b: *s = XK_diaeresis; break;
case 0x7c: *s = 'f'; break;
- case 0x7d: *s = 0xbc; break;
- case 0x7e: *s = 0xb4; break;
+ case 0x7d: *s = XK_onequarter; break;
+ case 0x7e: *s = XK_acute; break;
}
break;
case 'C':
case '5': /* Finnish */
switch (*s &= 0x7f) {
- case 0x5b: *s = 0xc4; break;
- case 0x5c: *s = 0xd6; break;
- case 0x5d: *s = 0xc5; break;
- case 0x5e: *s = 0xdc; break;
- case 0x60: *s = 0xe9; break;
- case 0x7b: *s = 0xe4; break;
- case 0x7c: *s = 0xf6; break;
- case 0x7d: *s = 0xe5; break;
- case 0x7e: *s = 0xfc; break;
+ case 0x5b: *s = XK_Adiaeresis; break;
+ case 0x5c: *s = XK_Odiaeresis; break;
+ case 0x5d: *s = XK_Aring; break;
+ case 0x5e: *s = XK_Udiaeresis; break;
+ case 0x60: *s = XK_eacute; break;
+ case 0x7b: *s = XK_adiaeresis; break;
+ case 0x7c: *s = XK_odiaeresis; break;
+ case 0x7d: *s = XK_aring; break;
+ case 0x7e: *s = XK_udiaeresis; break;
}
break;
case 'R': /* French */
switch (*s &= 0x7f) {
- case '#': *s = 0x1e; break;
- case '@': *s = 0xe0; break;
- case 0x5b: *s = 0xb0; break;
- case 0x5c: *s = 0xe7; break;
- case 0x5d: *s = 0xa7; break;
- case 0x7b: *s = 0xe9; break;
- case 0x7c: *s = 0xf9; break;
- case 0x7d: *s = 0xe8; break;
- case 0x7e: *s = 0xa8; break;
+ case '#': *s = XK_sterling; break;
+ case '@': *s = XK_agrave; break;
+ case 0x5b: *s = XK_degree; break;
+ case 0x5c: *s = XK_ccedilla; break;
+ case 0x5d: *s = XK_section; break;
+ case 0x7b: *s = XK_eacute; break;
+ case 0x7c: *s = XK_ugrave; break;
+ case 0x7d: *s = XK_egrave; break;
+ case 0x7e: *s = XK_diaeresis; break;
}
- break;
+ break;
case 'Q': /* French Canadian */
switch (*s &= 0x7f) {
- case '@': *s = 0xe0; break;
- case 0x5b: *s = 0xe2; break;
- case 0x5c: *s = 0xe7; break;
- case 0x5d: *s = 0xea; break;
- case 0x5e: *s = 0xee; break;
- case 0x60: *s = 0xf4; break;
- case 0x7b: *s = 0xe9; break;
- case 0x7c: *s = 0xf9; break;
- case 0x7d: *s = 0xe8; break;
- case 0x7e: *s = 0xfb; break;
+ case '@': *s = XK_agrave; break;
+ case 0x5b: *s = XK_acircumflex; break;
+ case 0x5c: *s = XK_ccedilla; break;
+ case 0x5d: *s = XK_ecircumflex; break;
+ case 0x5e: *s = XK_icircumflex; break;
+ case 0x60: *s = XK_ocircumflex; break;
+ case 0x7b: *s = XK_eacute; break;
+ case 0x7c: *s = XK_ugrave; break;
+ case 0x7d: *s = XK_egrave; break;
+ case 0x7e: *s = XK_ucircumflex; break;
}
break;
case 'K': /* German */
switch (*s &= 0x7f) {
- case '@': *s = 0xa7; break;
- case 0x5b: *s = 0xc4; break;
- case 0x5c: *s = 0xd6; break;
- case 0x5d: *s = 0xdc; break;
- case 0x7b: *s = 0xe4; break;
- case 0x7c: *s = 0xf6; break;
- case 0x7d: *s = 0xfc; break;
- case 0x7e: *s = 0xdf; break;
+ case '@': *s = XK_section; break;
+ case 0x5b: *s = XK_Adiaeresis; break;
+ case 0x5c: *s = XK_Odiaeresis; break;
+ case 0x5d: *s = XK_Udiaeresis; break;
+ case 0x7b: *s = XK_adiaeresis; break;
+ case 0x7c: *s = XK_odiaeresis; break;
+ case 0x7d: *s = XK_udiaeresis; break;
+ case 0x7e: *s = XK_ssharp; break;
}
break;
case 'Y': /* Italian */
switch (*s &= 0x7f) {
- case '#': *s = 0x1e; break;
- case '@': *s = 0xa7; break;
- case 0x5b: *s = 0xb0; break;
- case 0x5c: *s = 0xe7; break;
- case 0x5d: *s = 0xe9; break;
- case 0x60: *s = 0xf9; break;
- case 0x7b: *s = 0xe0; break;
- case 0x7c: *s = 0xf2; break;
- case 0x7d: *s = 0xe8; break;
- case 0x7e: *s = 0xec; break;
+ case '#': *s = XK_sterling; break;
+ case '@': *s = XK_section; break;
+ case 0x5b: *s = XK_degree; break;
+ case 0x5c: *s = XK_ccedilla; break;
+ case 0x5d: *s = XK_eacute; break;
+ case 0x60: *s = XK_ugrave; break;
+ case 0x7b: *s = XK_agrave; break;
+ case 0x7c: *s = XK_ograve; break;
+ case 0x7d: *s = XK_egrave; break;
+ case 0x7e: *s = XK_igrave; break;
}
break;
case 'E':
case '6': /* Norwegian/Danish */
switch (*s &= 0x7f) {
- case '@': *s = 0xc4; break;
- case 0x5b: *s = 0xc6; break;
- case 0x5c: *s = 0xd8; break;
- case 0x5d: *s = 0xc5; break;
- case 0x5e: *s = 0xdc; break;
- case 0x60: *s = 0xe4; break;
- case 0x7b: *s = 0xe6; break;
- case 0x7c: *s = 0xf8; break;
- case 0x7d: *s = 0xe5; break;
- case 0x7e: *s = 0xfc; break;
+ case '@': *s = XK_Adiaeresis; break;
+ case 0x5b: *s = XK_AE; break;
+ case 0x5c: *s = XK_Ooblique; break;
+ case 0x5d: *s = XK_Aring; break;
+ case 0x5e: *s = XK_Udiaeresis; break;
+ case 0x60: *s = XK_adiaeresis; break;
+ case 0x7b: *s = XK_ae; break;
+ case 0x7c: *s = XK_oslash; break;
+ case 0x7d: *s = XK_aring; break;
+ case 0x7e: *s = XK_udiaeresis; break;
}
break;
case 'Z': /* Spanish */
switch (*s &= 0x7f) {
- case '#': *s = 0x1e; break;
- case '@': *s = 0xa7; break;
- case 0x5b: *s = 0xa1; break;
- case 0x5c: *s = 0xd1; break;
- case 0x5d: *s = 0xbf; break;
- case 0x7b: *s = 0xb0; break;
- case 0x7c: *s = 0xf1; break;
- case 0x7d: *s = 0xe7; break;
+ case '#': *s = XK_sterling; break;
+ case '@': *s = XK_section; break;
+ case 0x5b: *s = XK_exclamdown; break;
+ case 0x5c: *s = XK_Ntilde; break;
+ case 0x5d: *s = XK_questiondown; break;
+ case 0x7b: *s = XK_degree; break;
+ case 0x7c: *s = XK_ntilde; break;
+ case 0x7d: *s = XK_ccedilla; break;
}
break;
case 'H':
case '7': /* Swedish */
switch (*s &= 0x7f) {
- case '@': *s = 0xc9; break;
- case 0x5b: *s = 0xc4; break;
- case 0x5c: *s = 0xd6; break;
- case 0x5d: *s = 0xc5; break;
- case 0x5e: *s = 0xdc; break;
- case 0x60: *s = 0xe9; break;
- case 0x7b: *s = 0xe4; break;
- case 0x7c: *s = 0xf6; break;
- case 0x7d: *s = 0xe5; break;
- case 0x7e: *s = 0xfc; break;
+ case '@': *s = XK_Eacute; break;
+ case 0x5b: *s = XK_Adiaeresis; break;
+ case 0x5c: *s = XK_Odiaeresis; break;
+ case 0x5d: *s = XK_Aring; break;
+ case 0x5e: *s = XK_Udiaeresis; break;
+ case 0x60: *s = XK_eacute; break;
+ case 0x7b: *s = XK_adiaeresis; break;
+ case 0x7c: *s = XK_odiaeresis; break;
+ case 0x7d: *s = XK_aring; break;
+ case 0x7e: *s = XK_udiaeresis; break;
}
break;
case '=': /* Swiss */
switch (*s &= 0x7f) {
- case '#': *s = 0xf9; break;
- case '@': *s = 0xe0; break;
- case 0x5b: *s = 0xe9; break;
- case 0x5c: *s = 0xe7; break;
- case 0x5d: *s = 0xea; break;
- case 0x5e: *s = 0xee; break;
- case 0x5f: *s = 0xe8; break;
- case 0x60: *s = 0xf4; break;
- case 0x7b: *s = 0xe4; break;
- case 0x7c: *s = 0xf6; break;
- case 0x7d: *s = 0xfc; break;
- case 0x7e: *s = 0xfb; break;
+ case '#': *s = XK_ugrave; break;
+ case '@': *s = XK_agrave; break;
+ case 0x5b: *s = XK_eacute; break;
+ case 0x5c: *s = XK_ccedilla; break;
+ case 0x5d: *s = XK_ecircumflex; break;
+ case 0x5e: *s = XK_icircumflex; break;
+ case 0x5f: *s = XK_egrave; break;
+ case 0x60: *s = XK_ocircumflex; break;
+ case 0x7b: *s = XK_adiaeresis; break;
+ case 0x7c: *s = XK_odiaeresis; break;
+ case 0x7d: *s = XK_udiaeresis; break;
+ case 0x7e: *s = XK_ucircumflex; break;
}
break;
Index: config.guess
--- xterm-90+/config.guess Sat Nov 21 11:40:42 1998
+++ xterm-91/config.guess Sun Jan 17 10:46:35 1999
@@ -112,6 +112,9 @@
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit 0 ;;
arc64:OpenBSD:*:*)
echo mips64el-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -139,7 +142,7 @@
SR2?01:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
- Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+ Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
echo pyramid-pyramid-sysv3
@@ -150,6 +153,9 @@
NILE:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
@@ -216,6 +222,9 @@
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
+ macppc:NetBSD:*:*)
+ echo powerpc-apple-netbsd${UNAME_RELEASE}
+ exit 0 ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit 0 ;;
@@ -325,7 +334,8 @@
fi
exit 0 ;;
*:AIX:*:4)
- if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -358,12 +368,44 @@
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
exit 0 ;;
- 9000/[3478]??:HP-UX:*:*)
+ 9000/[34678]??:HP-UX:*:*)
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
- 9000/8?? ) HP_ARCH=hppa1.0 ;;
+ 9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
+ sed 's/^ //' << EOF >dummy.c
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
+ rm -f dummy.c dummy
esac
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -469,6 +511,9 @@
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
i?86:BSD/386:*:* | *:BSD/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -482,13 +527,13 @@
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin32
+ echo ${UNAME_MACHINE}-pc-cygwin
exit 0 ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin32
+ echo powerpcle-unknown-cygwin
exit 0 ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -642,23 +687,9 @@
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
- # SysVr5/Unixware7
- i?86:*:5*:* | i?86:SYSTEM_V:5*:*)
- if uname -a | grep SCO >/dev/null 2>/dev/null ; then
- (/bin/uname -s|egrep UnixWare >/dev/null) && UNAME_VER=uw${UNAME_VERSION}
- if /bin/uname -X 2>/dev/null >/dev/null ; then
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
- fi
- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}${UNAME_VER}
- else
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
- fi
- exit 0 ;;
i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv4.2uw${UNAME_VERSION}
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
fi
@@ -677,6 +708,13 @@
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
+ i?86:UnixWare:*:*)
+ if /bin/uname -X 2>/dev/null >/dev/null ; then
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ fi
+ echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+ exit 0 ;;
pc:*:*:*)
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
@@ -760,13 +798,22 @@
news*:NEWS-OS:*:6*)
echo mips-sony-newsos6
exit 0 ;;
- R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+ R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit 0 ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit 0 ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit 0 ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
Index: config.sub
--- xterm-90+/config.sub Mon Nov 16 18:10:22 1998
+++ xterm-91/config.sub Sun Jan 17 10:49:12 1999
@@ -150,8 +150,8 @@
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
- | arme[lb] | pyramid | mn10200 | mn10300 \
- | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+ | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
@@ -175,7 +175,7 @@
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
- | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+ | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
| alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
| ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
@@ -349,13 +349,13 @@
basic_machine=i370-ibm
os=-mvs
;;
- s390 | s390-ibm*)
-# OS/390 support after:
-# Linkname: Mortice Kern Systems (MKS) Inc. - OS/390 OpenEdition -- GNU Utilities Downloads
-# URL: http://www.mks.com/s390/gnu/download.htm#autoconf
- basic_machine=s390-ibm # /* S/390 -- gil -- 1419 */
- os=-os390
- ;;
+ s390 | s390-ibm*)
+# OS/390 support after:
+# Linkname: Mortice Kern Systems (MKS) Inc. - OS/390 OpenEdition -- GNU Utilities Downloads
+# URL: http://www.mks.com/s390/gnu/download.htm#autoconf
+ basic_machine=s390-ibm # /* S/390 -- gil -- 1419 */
+ os=-os390
+ ;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i[34567]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
@@ -714,15 +714,14 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* \
- | -hms* | -mvs* | -os390* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* | -os390* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv*)
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-linux*)
@@ -834,6 +833,9 @@
;;
sparc-* | *-sun)
os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
;;
s390-ibm)
os=-os390 # /* S/390 -- gil -- 1451 */
Index: configure
--- xterm-90+/configure Sun Dec 20 22:50:38 1998
+++ xterm-91/configure Thu Jan 21 06:52:18 1999
@@ -1,7 +1,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.971230
+# Generated automatically using autoconf version 2.13.19990117
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -49,6 +49,7 @@
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
# Maximum number of lines to put in a shell here document.
ac_max_here_lines=12
@@ -365,7 +366,7 @@
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.12.971230"
+ echo "configure generated by autoconf version 2.13.19990117"
exit 0 ;;
-with-* | --with-*)
@@ -535,9 +536,11 @@
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
+ac_exeext=
+ac_objext=o
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -575,26 +578,26 @@
if test -f $srcdir/config.guess ; then
# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:584: checking host system type" >&5
+echo "configure:587: checking host system type" >&5
host_alias=$host
case "$host_alias" in
NONE)
case $nonopt in
NONE)
- if host_alias=`$ac_config_guess`; then :
+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
fi ;;
*) host_alias=$nonopt ;;
esac ;;
esac
-host=`$ac_config_sub $host_alias`
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -631,15 +634,16 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:635: checking for $ac_word" >&5
+echo "configure:638: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC="gcc"
@@ -660,16 +664,17 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:664: checking for $ac_word" >&5
+echo "configure:668: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
- for ac_dir in $PATH; do
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -704,25 +709,61 @@
echo "$ac_t""no" 1>&6
fi
+ if test -z "$CC"; then
+ case "`uname -s`" in
+ *win32* | *WIN32*)
+ # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:719: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_CC="cl"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+ ;;
+ esac
+ fi
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
-cat > conftest.$ac_ext <<EOF
-#line 722 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 762 "configure"
#include "confdefs.h"
+
main(){return(0);}
EOF
-if { (eval echo configure:726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -736,18 +777,24 @@
ac_cv_prog_cc_works=no
fi
rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:746: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:751: checking whether we are using GNU C" >&5
+echo "configure:798: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -756,7 +803,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -767,11 +814,15 @@
if test $ac_cv_prog_gcc = yes; then
GCC=yes
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:775: checking whether ${CC-cc} accepts -g" >&5
+else
+ GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:826: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -786,20 +837,24 @@
fi
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
CFLAGS="-g -O2"
else
- CFLAGS="-O2"
+ CFLAGS="-g"
fi
else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:803: checking how to run the C preprocessor" >&5
+echo "configure:858: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -814,14 +869,14 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 818 "configure"
+#line 873 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@@ -831,14 +886,31 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 835 "configure"
+#line 890 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+#line 907 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@@ -851,6 +923,8 @@
rm -f conftest*
fi
rm -f conftest*
+fi
+rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
CPP="$ac_cv_prog_CPP"
@@ -861,13 +935,13 @@
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:865: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:939: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 871 "configure"
+#line 945 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -885,7 +959,7 @@
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 889 "configure"
+#line 963 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -913,28 +987,30 @@
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:921: checking for a BSD compatible install" >&5
+echo "configure:996: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
/|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
- for ac_prog in ginstall installbsd scoinst install; do
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
if test -f $ac_dir/$ac_prog; then
if test $ac_prog = install &&
grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
- # OSF/1 installbsd also uses dspmsg, but is usable.
:
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
@@ -964,14 +1040,16 @@
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
### checks for UNIX variants that set C preprocessor variables
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:973: checking for AIX" >&5
+echo "configure:1051: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 975 "configure"
+#line 1053 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -993,7 +1071,7 @@
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:997: checking for POSIXized ISC" >&5
+echo "configure:1075: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1015,18 +1093,18 @@
ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1019: checking for minix/config.h" >&5
+echo "configure:1097: checking for minix/config.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1024 "configure"
+#line 1102 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1068,18 +1146,18 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1072: checking for $ac_hdr" >&5
+echo "configure:1150: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1077 "configure"
+#line 1155 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1108,13 +1186,13 @@
### checks for typedefs
echo $ac_n "checking for size_t in <sys/types.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1112: checking for size_t in <sys/types.h> or <stdio.h>" >&5
+echo "configure:1190: checking for size_t in <sys/types.h> or <stdio.h>" >&5
if eval "test \"`echo '$''{'cf_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1118 "configure"
+#line 1196 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1127,7 +1205,7 @@
size_t x
; return 0; }
EOF
-if { (eval echo configure:1131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_size_t=yes
else
@@ -1147,12 +1225,12 @@
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1151: checking for ANSI C header files" >&5
+echo "configure:1229: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1156 "configure"
+#line 1234 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1160,8 +1238,8 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_header_stdc=yes
@@ -1177,7 +1255,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1181 "configure"
+#line 1259 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1195,7 +1273,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1199 "configure"
+#line 1277 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1216,7 +1294,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1220 "configure"
+#line 1298 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1227,7 +1305,7 @@
exit (0); }
EOF
-if { (eval echo configure:1231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1251,12 +1329,12 @@
fi
echo $ac_n "checking for time_t""... $ac_c" 1>&6
-echo "configure:1255: checking for time_t" >&5
+echo "configure:1333: checking for time_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1260 "configure"
+#line 1338 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1265,7 +1343,7 @@
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ egrep "(^|[^a-zA-Z_0-9])time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_time_t=yes
else
@@ -1293,12 +1371,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1297: checking for $ac_func" >&5
+echo "configure:1375: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1302 "configure"
+#line 1380 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1321,7 +1399,7 @@
; return 0; }
EOF
-if { (eval echo configure:1325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1347,12 +1425,12 @@
echo $ac_n "checking for memmove""... $ac_c" 1>&6
-echo "configure:1351: checking for memmove" >&5
+echo "configure:1429: checking for memmove" >&5
if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1356 "configure"
+#line 1434 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove(); below. */
@@ -1375,7 +1453,7 @@
; return 0; }
EOF
-if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_memmove=yes"
else
@@ -1394,12 +1472,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for bcopy""... $ac_c" 1>&6
-echo "configure:1398: checking for bcopy" >&5
+echo "configure:1476: checking for bcopy" >&5
if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1403 "configure"
+#line 1481 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bcopy(); below. */
@@ -1422,7 +1500,7 @@
; return 0; }
EOF
-if { (eval echo configure:1426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_bcopy=yes"
else
@@ -1438,7 +1516,7 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6
-echo "configure:1442: checking if bcopy does overlapping moves" >&5
+echo "configure:1520: checking if bcopy does overlapping moves" >&5
if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1447,7 +1525,7 @@
cf_cv_good_bcopy=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 1451 "configure"
+#line 1529 "configure"
#include "confdefs.h"
int main() {
@@ -1460,7 +1538,7 @@
}
EOF
-if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_good_bcopy=yes
else
@@ -1498,7 +1576,7 @@
echo $ac_n "checking for full tgetent function""... $ac_c" 1>&6
-echo "configure:1502: checking for full tgetent function" >&5
+echo "configure:1580: checking for full tgetent function" >&5
if eval "test \"`echo '$''{'cf_cv_lib_tgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1513,7 +1591,7 @@
echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
else
cat > conftest.$ac_ext <<EOF
-#line 1517 "configure"
+#line 1595 "configure"
#include "confdefs.h"
/* terminfo implementations ignore the buffer argument, making it useless for
@@ -1527,7 +1605,7 @@
tgetent(buffer, "vt100");
exit(buffer[0] == 0); }
EOF
-if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5
if test -n "$cf_termlib" ; then
@@ -1562,18 +1640,18 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1566: checking for $ac_hdr" >&5
+echo "configure:1644: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1571 "configure"
+#line 1649 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1605,7 +1683,7 @@
# validate values for the TERM environment variable given to
# child processes.
echo $ac_n "checking for partial tgetent function""... $ac_c" 1>&6
-echo "configure:1609: checking for partial tgetent function" >&5
+echo "configure:1687: checking for partial tgetent function" >&5
if eval "test \"`echo '$''{'cf_cv_lib_part_tgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1614,14 +1692,14 @@
for cf_termlib in $cf_TERMLIB ; do
LIBS="$cf_save_LIBS -l$cf_termlib"
cat > conftest.$ac_ext <<EOF
-#line 1618 "configure"
+#line 1696 "configure"
#include "confdefs.h"
int main() {
tgetent(0, 0)
; return 0; }
EOF
-if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "there is a terminfo/tgetent in $cf_termlib" 1>&5
cf_cv_lib_part_tgetent="-l$cf_termlib"
@@ -1644,18 +1722,18 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1648: checking for $ac_hdr" >&5
+echo "configure:1726: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1653 "configure"
+#line 1731 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1694,13 +1772,13 @@
### checks for structures
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:1698: checking for declaration of fd_set" >&5
+echo "configure:1776: checking for declaration of fd_set" >&5
if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1704 "configure"
+#line 1782 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1708,7 +1786,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:1712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -1716,7 +1794,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 1720 "configure"
+#line 1798 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1725,7 +1803,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -1752,13 +1830,13 @@
echo $ac_n "checking declaration of errno""... $ac_c" 1>&6
-echo "configure:1756: checking declaration of errno" >&5
+echo "configure:1834: checking declaration of errno" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1762 "configure"
+#line 1840 "configure"
#include "confdefs.h"
#if HAVE_STDLIB_H
@@ -1771,7 +1849,7 @@
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:1775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'errno'=yes'
else
@@ -1801,9 +1879,9 @@
EOF
echo $ac_n "checking existence of errno""... $ac_c" 1>&6
-echo "configure:1805: checking existence of errno" >&5
+echo "configure:1883: checking existence of errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 1807 "configure"
+#line 1885 "configure"
#include "confdefs.h"
#undef errno
@@ -1813,7 +1891,7 @@
errno = 2
; return 0; }
EOF
-if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval 'cf_cv_have_'errno'=yes'
else
@@ -1844,12 +1922,12 @@
### checks for compiler characteristics
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1848: checking for working const" >&5
+echo "configure:1926: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1853 "configure"
+#line 1931 "configure"
#include "confdefs.h"
int main() {
@@ -1898,7 +1976,7 @@
; return 0; }
EOF
-if { (eval echo configure:1902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1920,7 +1998,7 @@
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1924: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2002: checking for ${CC-cc} option to accept ANSI C" >&5
if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1944,7 +2022,7 @@
do
CFLAGS="$cf_save_CFLAGS $cf_arg"
cat > conftest.$ac_ext <<EOF
-#line 1948 "configure"
+#line 2026 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -1960,7 +2038,7 @@
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:1964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -1990,12 +2068,12 @@
### checks for system services and user specified options
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1994: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2072: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1999 "configure"
+#line 2077 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2011,7 +2089,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2037,7 +2115,7 @@
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:2041: checking for X" >&5
+echo "configure:2119: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -2100,13 +2178,13 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2104 "configure"
+#line 2182 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
# We can compile using X headers with no special include directory.
@@ -2174,14 +2252,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2178 "configure"
+#line 2256 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2281,7 +2359,7 @@
# FIXME: modify the library lookup in autoconf to
# allow _s.a suffix ahead of .a
echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6
-echo "configure:2285: checking for open in -lc_s" >&5
+echo "configure:2363: checking for open in -lc_s" >&5
ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2289,7 +2367,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2293 "configure"
+#line 2371 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2300,7 +2378,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2317,7 +2395,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lc_s $LIBS"
echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6
-echo "configure:2321: checking for gethostname in -lbsd" >&5
+echo "configure:2399: checking for gethostname in -lbsd" >&5
ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2325,7 +2403,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2329 "configure"
+#line 2407 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2336,7 +2414,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2353,7 +2431,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lbsd $LIBS"
echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6
-echo "configure:2357: checking for gethostname in -lnsl_s" >&5
+echo "configure:2435: checking for gethostname in -lnsl_s" >&5
ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2361,7 +2439,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2365 "configure"
+#line 2443 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2372,7 +2450,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2389,7 +2467,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lnsl_s $LIBS"
echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6
-echo "configure:2393: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:2471: checking for XOpenDisplay in -lX11_s" >&5
ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2397,7 +2475,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2401 "configure"
+#line 2479 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2408,7 +2486,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:2412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2425,7 +2503,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lX11_s $LIBS"
echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6
-echo "configure:2429: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:2507: checking for XtAppInitialize in -lXt_s" >&5
ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2433,7 +2511,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2437 "configure"
+#line 2515 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2444,7 +2522,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2485,7 +2563,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:2489: checking for socket in -lsocket" >&5
+echo "configure:2567: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2493,7 +2571,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2497 "configure"
+#line 2575 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2504,7 +2582,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2532,7 +2610,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:2536: checking for gethostname in -lnsl" >&5
+echo "configure:2614: checking for gethostname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2540,7 +2618,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2544 "configure"
+#line 2622 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2551,7 +2629,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2602,17 +2680,17 @@
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:2606: checking whether -R must be followed by a space" >&5
+echo "configure:2684: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2609 "configure"
+#line 2687 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -2628,14 +2706,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2632 "configure"
+#line 2710 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -2667,7 +2745,7 @@
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:2671: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2749: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2675,7 +2753,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2679 "configure"
+#line 2757 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2686,7 +2764,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2708,7 +2786,7 @@
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:2712: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2790: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2716,7 +2794,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2720 "configure"
+#line 2798 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2727,7 +2805,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2756,12 +2834,12 @@
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2760: checking for gethostbyname" >&5
+echo "configure:2838: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2765 "configure"
+#line 2843 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -2784,7 +2862,7 @@
; return 0; }
EOF
-if { (eval echo configure:2788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -2805,7 +2883,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2809: checking for gethostbyname in -lnsl" >&5
+echo "configure:2887: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2813,7 +2891,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2817 "configure"
+#line 2895 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2824,7 +2902,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2854,12 +2932,12 @@
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:2858: checking for connect" >&5
+echo "configure:2936: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2863 "configure"
+#line 2941 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -2882,7 +2960,7 @@
; return 0; }
EOF
-if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -2903,7 +2981,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2907: checking for connect in -lsocket" >&5
+echo "configure:2985: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2911,7 +2989,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2915 "configure"
+#line 2993 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2922,7 +3000,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2946,12 +3024,12 @@
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2950: checking for remove" >&5
+echo "configure:3028: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2955 "configure"
+#line 3033 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -2974,7 +3052,7 @@
; return 0; }
EOF
-if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -2995,7 +3073,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2999: checking for remove in -lposix" >&5
+echo "configure:3077: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3003,7 +3081,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3007 "configure"
+#line 3085 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3014,7 +3092,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:3018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3038,12 +3116,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3042: checking for shmat" >&5
+echo "configure:3120: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3047 "configure"
+#line 3125 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3066,7 +3144,7 @@
; return 0; }
EOF
-if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -3087,7 +3165,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3091: checking for shmat in -lipc" >&5
+echo "configure:3169: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3095,7 +3173,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3099 "configure"
+#line 3177 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3106,7 +3184,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:3110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3139,15 +3217,15 @@
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:3143: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3221: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lICE $LIBS"
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3151 "configure"
+#line 3229 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3158,7 +3236,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3185,7 +3263,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3189: checking for XOpenDisplay in -lX11" >&5
+echo "configure:3267: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3193,7 +3271,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3197 "configure"
+#line 3275 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3204,7 +3282,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3225,7 +3303,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3229: checking for XtAppInitialize in -lXt" >&5
+echo "configure:3307: checking for XtAppInitialize in -lXt" >&5
ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3233,7 +3311,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3237 "configure"
+#line 3315 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3244,7 +3322,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3300,18 +3378,18 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3304: checking for $ac_hdr" >&5
+echo "configure:3382: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3309 "configure"
+#line 3387 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:3392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -3360,18 +3438,18 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3364: checking for $ac_hdr" >&5
+echo "configure:3442: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3369 "configure"
+#line 3447 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:3452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -3397,27 +3475,27 @@
done
-echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6
-echo "configure:3402: checking for XmuClientWindow in -lXmu" >&5
-ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
+echo "configure:3480: checking for XextCreateExtension in -lXext" >&5
+ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXmu $LIBS"
+LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3410 "configure"
+#line 3488 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char XmuClientWindow();
+char XextCreateExtension();
int main() {
-XmuClientWindow()
+XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:3421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3432,27 +3510,22 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo Xmu | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
- LIBS="-lXmu $LIBS"
-
+ LIBS="-lXext $LIBS"
else
echo "$ac_t""no" 1>&6
+fi
-echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6
-echo "configure:3448: checking for XmuClientWindow in -lXmu_s" >&5
-ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'`
+
+echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6
+echo "configure:3521: checking for XmuClientWindow in -lXmu" >&5
+ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXmu_s $LIBS"
+LIBS="-lXmu $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3456 "configure"
+#line 3529 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3463,7 +3536,7 @@
XmuClientWindow()
; return 0; }
EOF
-if { (eval echo configure:3467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3478,42 +3551,38 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo Xmu_s | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo Xmu | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-lXmu_s $LIBS"
+ LIBS="-lXmu $LIBS"
else
echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:3498: checking for XextCreateExtension in -lXext" >&5
-ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6
+echo "configure:3567: checking for XmuClientWindow in -lXmu_s" >&5
+ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext $LIBS"
+LIBS="-lXmu_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3506 "configure"
+#line 3575 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char XextCreateExtension();
+char XmuClientWindow();
int main() {
-XextCreateExtension()
+XmuClientWindow()
; return 0; }
EOF
-if { (eval echo configure:3517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3528,14 +3597,23 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- LIBS="-lXext $LIBS"
+ ac_tr_lib=HAVE_LIB`echo Xmu_s | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lXmu_s $LIBS"
+
else
echo "$ac_t""no" 1>&6
fi
+fi
+
echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6
-echo "configure:3539: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5
+echo "configure:3617: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5
ac_lib_var=`echo $cf_x_athena'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3543,7 +3621,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$cf_x_athena $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3547 "configure"
+#line 3625 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3554,7 +3632,7 @@
XawSimpleMenuAddGlobalActions()
; return 0; }
EOF
-if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3574,7 +3652,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s""... $ac_c" 1>&6
-echo "configure:3578: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5
+echo "configure:3656: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5
ac_lib_var=`echo ${cf_x_athena}_s'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3582,7 +3660,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l${cf_x_athena}_s $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3586 "configure"
+#line 3664 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3593,7 +3671,7 @@
XawSimpleMenuAddGlobalActions()
; return 0; }
EOF
-if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3633,7 +3711,7 @@
# Extract the first word of "xterm", so it can be a program name with args.
set dummy xterm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3637: checking for $ac_word" >&5
+echo "configure:3715: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XTERM_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3641,9 +3719,13 @@
/*)
ac_cv_path_XTERM_PATH="$XTERM_PATH" # Let the user override the test with a path.
;;
+ ?:/*)
+ ac_cv_path_XTERM_PATH="$XTERM_PATH" # Let the user override the test with a dos path.
+ ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_XTERM_PATH="$ac_dir/$ac_word"
@@ -3663,7 +3745,7 @@
XTERM_MODE=755
echo $ac_n "checking for presumed installation-mode""... $ac_c" 1>&6
-echo "configure:3667: checking for presumed installation-mode" >&5
+echo "configure:3749: checking for presumed installation-mode" >&5
if test -f "$XTERM_PATH" ; then
ls -l $XTERM_PATH >conftest.out
read cf_mode cf_rest <conftest.out
@@ -3682,12 +3764,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3686: checking for $ac_func" >&5
+echo "configure:3768: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3691 "configure"
+#line 3773 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3710,7 +3792,7 @@
; return 0; }
EOF
-if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3736,7 +3818,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:3740: checking if we should use imake to help" >&5
+echo "configure:3822: checking if we should use imake to help" >&5
# Check whether --enable-imake or --disable-imake was given.
if test "${enable_imake+set}" = set; then
@@ -3761,7 +3843,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3765: checking for $ac_word" >&5
+echo "configure:3847: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_IMAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3769,9 +3851,13 @@
/*)
ac_cv_path_IMAKE="$IMAKE" # Let the user override the test with a path.
;;
+ ?:/*)
+ ac_cv_path_IMAKE="$IMAKE" # Let the user override the test with a dos path.
+ ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_IMAKE="$ac_dir/$ac_word"
@@ -3896,7 +3982,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:3900: checking for default terminal-id" >&5
+echo "configure:3986: checking for default terminal-id" >&5
# Check whether --with-terminal-id or --without-terminal-id was given.
if test "${with_terminal_id+set}" = set; then
@@ -3912,12 +3998,12 @@
;;
esac
cat >> confdefs.h <<EOF
-#define DFT_DECID $default_termid
+#define DFT_DECID "$default_termid"
EOF
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:3921: checking for default terminal-type" >&5
+echo "configure:4007: checking for default terminal-type" >&5
# Check whether --with-terminal-type or --without-terminal-type was given.
if test "${with_terminal_type+set}" = set; then
@@ -3934,7 +4020,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:3938: checking for private terminfo-directory" >&5
+echo "configure:4024: checking for private terminfo-directory" >&5
# Check whether --with-own-terminfo or --without-own-terminfo was given.
if test "${with_own_terminfo+set}" = set; then
@@ -3959,7 +4045,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:3963: checking if you want active-icons" >&5
+echo "configure:4049: checking if you want active-icons" >&5
# Check whether --enable-active-icon or --disable-active-icon was given.
if test "${enable_active_icon+set}" = set; then
@@ -3985,7 +4071,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:3989: checking if you want ANSI color" >&5
+echo "configure:4075: checking if you want ANSI color" >&5
# Check whether --enable-ansi-color or --disable-ansi-color was given.
if test "${enable_ansi_color+set}" = set; then
@@ -4009,7 +4095,7 @@
echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6
-echo "configure:4013: checking if you want 16 colors like aixterm" >&5
+echo "configure:4099: checking if you want 16 colors like aixterm" >&5
# Check whether --enable-16-color or --disable-16-color was given.
if test "${enable_16_color+set}" = set; then
@@ -4033,7 +4119,7 @@
echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6
-echo "configure:4037: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:4123: checking if you want bold colors mapped like IBM PC" >&5
# Check whether --enable-bold-color or --disable-bold-color was given.
if test "${enable_bold_color+set}" = set; then
@@ -4057,7 +4143,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4061: checking if you want color-mode enabled by default" >&5
+echo "configure:4147: checking if you want color-mode enabled by default" >&5
# Check whether --enable-color-mode or --disable-color-mode was given.
if test "${enable_color_mode+set}" = set; then
@@ -4081,7 +4167,7 @@
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:4085: checking if you want support for color highlighting" >&5
+echo "configure:4171: checking if you want support for color highlighting" >&5
# Check whether --enable-highlighting or --disable-highlighting was given.
if test "${enable_highlighting+set}" = set; then
@@ -4105,7 +4191,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:4109: checking if you want support for doublesize characters" >&5
+echo "configure:4195: checking if you want support for doublesize characters" >&5
# Check whether --enable-doublechars or --disable-doublechars was given.
if test "${enable_doublechars+set}" = set; then
@@ -4129,7 +4215,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:4133: checking if you want fallback-support for box characters" >&5
+echo "configure:4219: checking if you want fallback-support for box characters" >&5
# Check whether --enable-boxchars or --disable-boxchars was given.
if test "${enable_boxchars+set}" = set; then
@@ -4153,7 +4239,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:4157: checking if you want support for HP-style function keys" >&5
+echo "configure:4243: checking if you want support for HP-style function keys" >&5
# Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
if test "${enable_hp_fkeys+set}" = set; then
@@ -4179,7 +4265,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:4183: checking if you want support for input-method" >&5
+echo "configure:4269: checking if you want support for input-method" >&5
# Check whether --enable-input-method or --disable-input-method was given.
if test "${enable_input_method+set}" = set; then
@@ -4205,7 +4291,7 @@
fi
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:4209: checking if you want support for internationalization" >&5
+echo "configure:4295: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -4231,7 +4317,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:4235: checking if you want support for logging" >&5
+echo "configure:4321: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -4255,7 +4341,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:4259: checking if you want to allow logging via a pipe" >&5
+echo "configure:4345: checking if you want to allow logging via a pipe" >&5
# Check whether --enable-logfile-exec or --disable-logfile-exec was given.
if test "${enable_logfile_exec+set}" = set; then
@@ -4282,7 +4368,7 @@
fi
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:4286: checking if you want support for right-scrollbar" >&5
+echo "configure:4372: checking if you want support for right-scrollbar" >&5
# Check whether --enable-rightbar or --disable-rightbar was given.
if test "${enable_rightbar+set}" = set; then
@@ -4308,7 +4394,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:4312: checking if you want check for redundant name-change" >&5
+echo "configure:4398: checking if you want check for redundant name-change" >&5
# Check whether --enable-samename or --disable-samename was given.
if test "${enable_samename+set}" = set; then
@@ -4332,7 +4418,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:4336: checking if you want support for tek4014" >&5
+echo "configure:4422: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -4362,7 +4448,7 @@
fi
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:4366: checking if you want VT52 emulation" >&5
+echo "configure:4452: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -4386,7 +4472,7 @@
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:4390: checking if you want -ziconbeep option" >&5
+echo "configure:4476: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -4411,7 +4497,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:4415: checking if you want debugging traces" >&5
+echo "configure:4501: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -4440,7 +4526,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:4444: checking if you want to see long compiling messages" >&5
+echo "configure:4530: checking if you want to see long compiling messages" >&5
# Check whether --enable-echo or --disable-echo was given.
if test "${enable_echo+set}" = set; then
@@ -4480,7 +4566,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:4484: checking if you want magic cookie emulation" >&5
+echo "configure:4570: checking if you want magic cookie emulation" >&5
# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
if test "${enable_xmc_glitch+set}" = set; then
@@ -4509,7 +4595,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:4513: checking if you want to turn on gcc warnings" >&5
+echo "configure:4599: checking if you want to turn on gcc warnings" >&5
# Check whether --enable-warnings or --disable-warnings was given.
if test "${enable_warnings+set}" = set; then
@@ -4549,9 +4635,9 @@
if test -n "$GCC"
then
echo "checking for gcc __attribute__ directives" 1>&6
-echo "configure:4553: checking for gcc __attribute__ directives" >&5
+echo "configure:4639: checking for gcc __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 4555 "configure"
+#line 4641 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -4589,7 +4675,7 @@
EOF
;;
esac
- if { (eval echo configure:4593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:4679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
cat conftest.h >>confdefs.h
# else
@@ -4606,11 +4692,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 4610 "configure"
+#line 4696 "configure"
int main(int argc, char *argv[]) { return argv[argc-1] == 0; }
EOF
echo "checking for gcc warning options" 1>&6
-echo "configure:4614: checking for gcc warning options" >&5
+echo "configure:4700: checking for gcc warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -4628,7 +4714,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:4632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:4718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
@@ -4671,7 +4757,7 @@
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
- case `(ac_space=' '; set) 2>&1 | grep '^ac_space='` in
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
*ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote substitution
# turns \\\\ into \\, and sed turns \\ into \).
@@ -4738,7 +4824,7 @@
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.12.971230"
+ echo "$CONFIG_STATUS generated by autoconf version 2.13.19990117"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -4758,9 +4844,11 @@
s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
+s%@SHELL@%$SHELL%g
s%@CFLAGS@%$CFLAGS%g
s%@CPPFLAGS@%$CPPFLAGS%g
s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
s%@DEFS@%$DEFS%g
s%@LDFLAGS@%$LDFLAGS%g
s%@LIBS@%$LIBS%g
@@ -4787,6 +4875,7 @@
s%@CC@%$CC%g
s%@CPP@%$CPP%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@X_CFLAGS@%$X_CFLAGS%g
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
Index: configure.in
--- xterm-90+/configure.in Sun Dec 20 22:50:38 1998
+++ xterm-91/configure.in Thu Jan 21 06:52:06 1999
@@ -126,7 +126,7 @@
vt*) default_termid=`echo $default_termid | sed -e 's/^..//'`
;;
esac
-AC_DEFINE_UNQUOTED(DFT_DECID,$default_termid)
+AC_DEFINE_UNQUOTED(DFT_DECID,"$default_termid")
AC_MSG_CHECKING(for default terminal-type)
AC_ARG_WITH(terminal-type,
Index: input.c
--- xterm-90+/input.c Sun Dec 20 22:50:38 1998
+++ xterm-91/input.c Wed Jan 20 21:06:07 1999
@@ -145,6 +145,14 @@
reply.a_nparam = 0;
reply.a_inters = 0;
+ /* VT220 & up: National Replacement Characters */
+ if ((nbytes == 1)
+ && (term->flags & NATIONAL)) {
+ keysym = xtermCharSetIn(keysym, screen->keyboard_dialect[0]);
+ if (keysym < 128)
+ strbuf[0] = keysym;
+ }
+
/* VT300 & up: backarrow toggle */
if ((nbytes == 1)
&& !isModified(event)
Index: main.c
--- xterm-90+/main.c Sun Dec 20 22:50:38 1998
+++ xterm-91/main.c Thu Jan 21 05:51:35 1999
@@ -272,6 +272,7 @@
#endif
#ifdef SYSV /* { */
+
#ifdef USE_USG_PTYS /* AT&T SYSV has no ptyio.h */
#include <sys/stream.h> /* get typedef used in ptem.h */
#include <sys/stropts.h> /* for I_PUSH */
@@ -294,6 +295,7 @@
#define HAS_UTMP_UT_HOST
#define HAS_BSD_GROUPS
#endif
+
#ifdef macII
#define USE_SYSV_UTMP
#define HAS_UTMP_UT_HOST
@@ -306,11 +308,13 @@
#include <sgtty.h>
#include <sys/resource.h>
#endif
+
#ifdef SCO
#define USE_SYSV_UTMP
#define USE_POSIX_WAIT
#define HAS_UTMP_UT_HOST
#endif /* SCO */
+
#ifdef __hpux
#define HAS_BSD_GROUPS
#define USE_SYSV_UTMP
@@ -318,20 +322,27 @@
#define USE_POSIX_WAIT
#include <sys/ptyio.h>
#endif /* __hpux */
+
#ifdef __sgi
#define HAS_BSD_GROUPS
#include <sys/sysmacros.h>
#endif /* __sgi */
+
#ifdef sun
#include <sys/strredir.h>
#endif
+
#ifdef AIXV3
#define USE_SYSV_UTMP
#define HAS_UTMP_UT_HOST
#endif
+
#else /* } !SYSV { */ /* BSD systems */
+
#ifdef MINIX /* { */
+
#else /* } !MINIX { */
+
#ifndef linux
#ifndef USE_POSIX_TERMIOS
#include <sgtty.h>
@@ -348,12 +359,15 @@
#define setpgrp setpgid
#endif
#endif /* !linux */
+
#endif /* } MINIX */
+
#endif /* } !SYSV */
#ifdef _POSIX_SOURCE
#define USE_POSIX_WAIT
#endif
+
#ifdef SVR4
#define USE_POSIX_WAIT
#define HAS_SAVED_IDS_AND_SETEUID
@@ -396,13 +410,16 @@
#endif
#if (defined(SVR4) || defined(SCO325)) && !defined(__CYGWIN32__)
+
#include <utmpx.h>
#define setutent setutxent
#define getutent getutxent
#define getutid getutxid
#define endutent endutxent
#define pututline pututxline
+
#else
+
#ifdef ISC
#include <sys/types.h>
#endif
@@ -415,6 +432,7 @@
#if defined(_CRAY) && OSMAJORVERSION < 8
extern struct utmp *getutid __((struct utmp *_Id));
#endif
+
#endif
#ifndef ISC
@@ -889,6 +907,7 @@
#endif
{"-t", "*tekStartup", XrmoptionNoArg, (caddr_t) "on"},
{"+t", "*tekStartup", XrmoptionNoArg, (caddr_t) "off"},
+{"-ti", "*decTerminalID",XrmoptionSepArg, (caddr_t) NULL},
{"-tm", "*ttyModes", XrmoptionSepArg, (caddr_t) NULL},
{"-tn", "*termName", XrmoptionSepArg, (caddr_t) NULL},
{"-ulc", "*colorULMode", XrmoptionNoArg, (caddr_t) "off"},
@@ -995,6 +1014,7 @@
#if OPT_TEK4014
{ "-/+t", "turn on/off Tek emulation window" },
#endif
+{ "-ti termid", "terminal identifier" },
{ "-tm string", "terminal mode keywords and characters" },
{ "-tn name", "TERM environment variable name" },
{ "-/+ulc", "turn off/on display of underline as color" },
@@ -1227,8 +1247,7 @@
d_tio.c_cc[VREPRINT]= TREPRINT_DEF;
d_tio.c_cc[VLNEXT]= TLNEXT_DEF;
d_tio.c_cc[VDISCARD]= TDISCARD_DEF;
-#else /* !MINIX */
-#if defined(USE_SYSV_TERMIO) || defined(USE_POSIX_TERMIOS) /* { */
+#elif defined(USE_SYSV_TERMIO) || defined(USE_POSIX_TERMIOS) /* { */
/* Initialization is done here rather than above in order
** to prevent any assumptions about the order of the contents
** of the various terminal structures (which may change from
@@ -1449,8 +1468,7 @@
d_lmode = 0;
#endif /* } TIOCLSET */
#endif /* } macII, ATT, CRAY */
-#endif /* } USE_SYSV_TERMIO */
-#endif /* MINIX */
+#endif /* MINIX, etc */
#endif /* AMOEBA */
/* Init the Toolkit. */
@@ -1775,8 +1793,7 @@
if (fcntl(screen->respond, F_SETFD, mode) == -1)
Error(1);
nbio_register(screen->respond);
-#else /* !MINIX */
-#ifdef USE_SYSV_TERMIO
+#elif defined(USE_SYSV_TERMIO)
if (0 > (mode = fcntl(screen->respond, F_GETFL, 0)))
Error(1);
#ifdef O_NDELAY
@@ -1786,11 +1803,10 @@
#endif /* O_NDELAY */
if (fcntl(screen->respond, F_SETFL, mode))
Error(1);
-#else /* USE_SYSV_TERMIO */
+#else /* !MINIX && !USE_SYSV_TERMIO */
mode = 1;
if (ioctl (screen->respond, FIONBIO, (char *)&mode) == -1) SysError (ERROR_FIONBIO);
-#endif /* USE_SYSV_TERMIO */
-#endif /* MINIX */
+#endif /* MINIX, etc */
#endif /* AMOEBA */
FD_ZERO (&pty_mask);
@@ -1848,8 +1864,7 @@
#ifdef __osf__
int tty;
return (openpty(pty, &tty, ttydev, NULL, NULL));
-#endif
-#if defined(SYSV) && defined(i386) && !defined(SVR4)
+#elif defined(SYSV) && defined(i386) && !defined(SVR4)
/*
The order of this code is *important*. On SYSV/386 we want to open
a /dev/ttyp? first if at all possible. If none are available, then
@@ -1875,8 +1890,7 @@
*/
if (pty_search(pty) == 0)
return 0;
-#endif /* SYSV && i386 && !SVR4 */
-#if defined(ATT) && !defined(__sgi)
+#elif defined(ATT) && !defined(__sgi)
if ((*pty = open ("/dev/ptmx", O_RDWR)) < 0) {
return 1;
}
@@ -1887,15 +1901,13 @@
#endif
#endif
return 0;
-#else /* ATT else */
-#ifdef AIXV3
+#elif defined(AIXV3)
if ((*pty = open ("/dev/ptc", O_RDWR)) < 0) {
return 1;
}
strcpy(ttydev, ttyname(*pty));
return 0;
-#endif
-#if defined(__sgi) && OSMAJORVERSION >= 4
+#elif defined(__sgi) && OSMAJORVERSION >= 4
{
char *tty_name;
@@ -1905,8 +1917,7 @@
strcpy (ttydev, tty_name);
return 0;
}
-#endif
-#ifdef __convex__
+#elif defined(__convex__)
{
char *pty_name, *getpty();
@@ -1920,11 +1931,9 @@
}
return 1;
}
-#endif /* __convex__ */
-#ifdef USE_GET_PSEUDOTTY
+#elif defined(USE_GET_PSEUDOTTY)
return ((*pty = getpseudotty (&ttydev, &ptydev)) >= 0 ? 0 : 1);
-#else
-#if (defined(__sgi) && OSMAJORVERSION < 4) || (defined(umips) && defined (SYSTYPE_SYSV))
+#elif (defined(__sgi) && OSMAJORVERSION < 4) || (defined(umips) && defined (SYSTYPE_SYSV))
struct stat fstat_buf;
*pty = open ("/dev/ptc", O_RDWR);
@@ -1955,9 +1964,7 @@
return pty_search(pty);
-#endif /* __sgi or umips else */
-#endif /* USE_GET_PSEUDOTTY else */
-#endif /* ATT else */
+#endif
}
/*
@@ -2152,7 +2159,7 @@
/*
* temporary hack to get xterm working on att ptys
*/
-void
+static void
HsSysError(int pf, int error)
{
fprintf(stderr, "%s: fatal pty error %d (errno=%d) on tty %s\n",
@@ -2192,10 +2199,9 @@
#ifdef HAS_LTCHARS
struct ltchars ltc;
#endif /* HAS_LTCHARS */
-#else /* else not USE_SYSV_TERMIO */
-#ifdef USE_POSIX_TERMIOS
+#elif defined(USE_POSIX_TERMIOS)
struct termios tio;
-#else /* else not USE_POSIX_TERMIOS */
+#else /* !USE_SYSV_TERMIO && !USE_POSIX_TERMIOS */
int ldisc = 0;
int discipline;
unsigned lmode;
@@ -2206,7 +2212,6 @@
int jmode;
struct jtchars jtc;
#endif /* sony */
-#endif /* USE_POSIX_TERMIOS */
#endif /* USE_SYSV_TERMIO */
char termcap [1024];
@@ -2219,11 +2224,9 @@
char *TermName = NULL;
#if defined(TIOCSSIZE) && (defined(sun) && !defined(SVR4))
struct ttysize ts;
-#else /* not old SunOS */
-#ifdef TIOCSWINSZ
+#elif defined(TIOCSWINSZ)
struct winsize ws;
-#endif /* TIOCSWINSZ */
-#endif /* sun */
+#endif
struct passwd *pw = NULL;
#ifdef UTMP
#if (defined(SVR4) || defined(SCO325)) && !defined(__CYGWIN32__)
@@ -2329,11 +2332,10 @@
if(ioctl(tty, TCGETA, &tio) == -1)
tio = d_tio;
-#else /* not USE_SYSV_TERMIO */
-#ifdef USE_POSIX_TERMIOS
+#elif defined(USE_POSIX_TERMIOS)
if (tcgetattr(tty, &tio) == -1)
tio = d_tio;
-#else /* not USE_POSIX_TERMIOS */
+#else /* !USE_SYSV_TERMIO && !USE_POSIX_TERMIOS */
if(ioctl(tty, TIOCGETP, (char *)&sg) == -1)
sg = d_sg;
if(ioctl(tty, TIOCGETC, (char *)&tc) == -1)
@@ -2346,7 +2348,6 @@
if(ioctl(tty, TIOCKGETC, (char *)&jtc) == -1)
jtc = d_jtc;
#endif /* sony */
-#endif /* USE_POSIX_TERMIOS */
#endif /* USE_SYSV_TERMIO */
#ifdef MINIX
/* Editing shells interfere with xterms started in
@@ -2465,8 +2466,7 @@
ts.ts_lines = screen->max_row + 1;
ts.ts_cols = screen->max_col + 1;
}
-#else /* not old SunOS */
-#ifdef TIOCSWINSZ
+#elif defined(TIOCSWINSZ)
/* tell tty how big window is */
#if OPT_TEK4014
if(TEK4014_ACTIVE(screen)) {
@@ -2482,8 +2482,7 @@
ws.ws_xpixel = FullWidth(screen);
ws.ws_ypixel = FullHeight(screen);
}
-#endif /* TIOCSWINSZ */
-#endif /* sun */
+#endif /* sun vs TIOCSWINSZ */
if (!am_slave) {
#ifdef USE_HANDSHAKE
@@ -3156,8 +3155,7 @@
#if defined(SVR4) || defined(SCO325)
if (term->misc.login_shell)
updwtmpx(WTMPX_FILE, &utmp);
-#else
-#if defined(linux) && __GLIBC__ >= 2 && !(defined(__powerpc__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
+#elif defined(linux) && __GLIBC__ >= 2 && !(defined(__powerpc__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
if (term->misc.login_shell)
updwtmp(etc_wtmp, &utmp);
#else
@@ -3168,7 +3166,6 @@
}
#endif
#endif
-#endif
/* close the file */
(void) endutent();
@@ -3202,7 +3199,7 @@
write(i, (char *)&utmp, sizeof(struct utmp));
close(i);
added_utmp_entry = True;
-#ifdef WTMP
+#if defined(WTMP)
if (term->misc.login_shell &&
(i = open(etc_wtmp, O_WRONLY|O_APPEND)) >= 0) {
int status;
@@ -3210,8 +3207,7 @@
sizeof(struct utmp));
status = close(i);
}
-#endif /* WTMP */
-#ifdef MNX_LASTLOG
+#elif defined(MNX_LASTLOG)
if (term->misc.login_shell &&
(i = open(_U_LASTLOG, O_WRONLY)) >= 0) {
lseek(i, (long)(screen->uid *
@@ -3220,7 +3216,7 @@
sizeof (struct utmp));
close(i);
}
-#endif /* MNX_LASTLOG */
+#endif /* WTMP or MNX_LASTLOG */
} else
tslot = -tslot;
}
@@ -3299,14 +3295,12 @@
#if defined(TIOCSSIZE) && (defined(sun) && !defined(SVR4))
ts.ts_lines = screen->max_row + 1;
ts.ts_cols = screen->max_col + 1;
-#else /* not old SunOS */
-#ifdef TIOCSWINSZ
+#elif defined(TIOCSWINSZ)
ws.ws_row = screen->max_row + 1;
ws.ws_col = screen->max_col + 1;
ws.ws_xpixel = FullWidth(screen);
ws.ws_ypixel = FullHeight(screen);
-#endif /* TIOCSWINSZ */
-#endif /* sun else !sun */
+#endif /* sun vs TIOCSWINSZ */
}
}
#endif /* USE_HANDSHAKE */
@@ -3359,14 +3353,12 @@
#if defined(TIOCSSIZE) && (defined(sun) && !defined(SVR4))
i = ioctl (0, TIOCSSIZE, &ts);
TRACE(("spawn TIOCSSIZE %dx%d return %d\n", ts.ts_lines, ts.ts_cols, i))
-#else /* not old SunOS */
-#ifdef TIOCSWINSZ
+#elif defined(TIOCSWINSZ)
i = ioctl (0, TIOCSWINSZ, (char *)&ws);
TRACE(("spawn TIOCSWINSZ %dx%d return %d\n", ws.ws_row, ws.ws_col, i))
#else
TRACE(("spawn cannot tell pty its size\n"))
-#endif /* TIOCSWINSZ */
-#endif /* sun */
+#endif /* sun vs TIOCSWINSZ */
signal(SIGHUP, SIG_DFL);
if (command_to_exec) {
@@ -3519,8 +3511,7 @@
signal (SIGQUIT, SIG_IGN);
#endif
signal (SIGTERM, SIG_IGN);
-#else /* else is bsd or has job control */
-#if defined(SYSV) || defined(__osf__)
+#elif defined(SYSV) || defined(__osf__)
/* if we were spawned by a jobcontrol smart shell (like ksh or csh),
* then our pgrp and pid will be the same. If we were spawned by
* a jobcontrol dumb shell (like /bin/sh), then we will be in our
@@ -3542,7 +3533,6 @@
signal (SIGQUIT, Exit);
signal (SIGTERM, Exit);
signal (SIGPIPE, Exit);
-#endif /* SYSV */
#endif /* USE_SYSV_SIGNALS and not SIGTSTP */
return 0;
@@ -3963,8 +3953,7 @@
#if defined(SVR4) || defined(SCO325)
if (term->misc.login_shell)
updwtmpx(WTMPX_FILE, utptr);
-#else
-#if defined(linux) && __GLIBC__ >= 2 && !(defined(__powerpc__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
+#elif defined(linux) && __GLIBC__ >= 2 && !(defined(__powerpc__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
strncpy (utmp.ut_line, utptr->ut_line, sizeof (utmp.ut_line));
if (term->misc.login_shell)
updwtmp(etc_wtmp, utptr);
@@ -3977,7 +3966,6 @@
}
#endif
#endif
-#endif
}
(void) endutent();
@@ -4086,22 +4074,19 @@
pid_t pid;
pid = waitpid(-1, NULL, WNOHANG);
-#else /* USE_POSIX_WAIT */
-#if defined(USE_SYSV_SIGNALS) && (defined(CRAY) || !defined(SIGTSTP))
+#elif defined(USE_SYSV_SIGNALS) && (defined(CRAY) || !defined(SIGTSTP))
/* cannot do non-blocking wait */
int pid = 0;
#else /* defined(USE_SYSV_SIGNALS) && (defined(CRAY) || !defined(SIGTSTP)) */
-#ifndef Lynx
- union wait status;
-#else
+#if defined(Lynx)
int status;
+#else
+ union wait status;
#endif
register int pid;
pid = wait3 (&status, WNOHANG, (struct rusage *)NULL);
-#endif /* defined(USE_SYSV_SIGNALS) && !defined(SIGTSTP) */
#endif /* USE_POSIX_WAIT else */
-
return pid;
}
@@ -4193,8 +4178,20 @@
int GetBytesAvailable (int fd)
{
-#ifndef AMOEBA
-#ifdef FIONREAD
+#ifdef AMOEBA
+ /*
+ * Since this routine is only used to poll X connections
+ * we can use an internal Xlib routine (oh what ugly).
+ */
+ register TScreen *screen = &term->screen;
+ int count;
+
+ if (ConnectionNumber(screen->display) != fd) {
+ Panic("Cannot get bytes available");
+ return -1;
+ }
+ return _X11TransAmFdBytesReadable(fd, &count) < 0 ? -1 : count;
+#elif defined(FIONREAD)
long arg;
ioctl (fd, FIONREAD, (char *) &arg);
return (int) arg;
@@ -4208,8 +4205,7 @@
return 1;
else
return 0;
-#else
-#ifdef MINIX
+#elif defined(MINIX)
/* The answer doesn't have to correct. Calling nbio_isinprogress is
* much cheaper than called nbio_select.
*/
@@ -4217,8 +4213,7 @@
return 0;
else
return 1;
-#else /* !MINIX */
-#ifdef FIORDCK
+#elif defined(FIORDCK)
return (ioctl (fd, FIORDCHK, NULL));
#else /* !FIORDCK */
struct pollfd pollfds[1];
@@ -4226,23 +4221,7 @@
pollfds[0].fd = fd;
pollfds[0].events = POLLIN;
return poll (pollfds, 1, 0);
-#endif /* FIORDCK */
-#endif /* MINIX */
#endif
-#else
- /*
- * Since this routine is only used to poll X connections
- * we can use an internal Xlib routine (oh what ugly).
- */
- register TScreen *screen = &term->screen;
- int count;
-
- if (ConnectionNumber(screen->display) != fd) {
- Panic("Cannot get bytes available");
- return -1;
- }
- return _X11TransAmFdBytesReadable(fd, &count) < 0 ? -1 : count;
-#endif /* AMOEBA */
}
/* Utility function to try to hide system differences from
@@ -4252,21 +4231,15 @@
kill_process_group(int pid, int sig)
{
TRACE(("kill_process_group(pid=%d, sig=%d)\n", pid, sig))
-#ifndef AMOEBA
-#ifndef X_NOT_POSIX
- return kill (-pid, sig);
-#else
-#if defined(SVR4) || defined(SYSV)
- return kill (-pid, sig);
-#else
- return killpg (pid, sig);
-#endif
-#endif
-#else /* AMOEBA */
+#ifdef AMOEBA
if (pid != 2) {
fprintf(stderr, "%s: unexpected process id %d.\n", ProgramName, pid);
abort();
}
ttysendsig(sig);
+#elif defined(SVR4) || defined(SYSV) || !defined(X_NOT_POSIX)
+ return kill (-pid, sig);
+#else
+ return killpg (pid, sig);
#endif /* AMOEBA */
}
Index: os2main.c
--- xterm-90+/os2main.c Sun Dec 20 22:50:38 1998
+++ xterm-91/os2main.c Thu Jan 21 06:20:08 1999
@@ -113,13 +113,7 @@
static int pty_search (int *pty);
static int remove_termcap_entry (char *buf, char *str);
static int spawn (void);
-static void DeleteWindow PROTO_XT_ACTIONS_ARGS;
-static void Help (void);
-static void KeyboardMapping PROTO_XT_ACTIONS_ARGS;
-static void Syntax (char *badOption);
-static void Version (void);
static void get_terminal (void);
-static void my_error_handler (String message);
static void resize (TScreen *s, char *oldtc, char *newtc);
static Bool added_utmp_entry = False;
@@ -174,7 +168,7 @@
static int override_tty_modes = 0;
struct _xttymodes {
char *name;
- int len;
+ size_t len;
int set;
char value;
} ttymodelist[] = {
@@ -404,6 +398,7 @@
#endif
{"-t", "*tekStartup", XrmoptionNoArg, (caddr_t) "on"},
{"+t", "*tekStartup", XrmoptionNoArg, (caddr_t) "off"},
+{"-ti", "*decTerminalID",XrmoptionSepArg, (caddr_t) NULL},
{"-tm", "*ttyModes", XrmoptionSepArg, (caddr_t) NULL},
{"-tn", "*termName", XrmoptionSepArg, (caddr_t) NULL},
{"-ulc", "*colorULMode", XrmoptionNoArg, (caddr_t) "off"},
@@ -510,6 +505,7 @@
#if OPT_TEK4014
{ "-/+t", "turn on/off Tek emulation window" },
#endif
+{ "-ti termid", "terminal identifier" },
{ "-tm string", "terminal mode keywords and characters" },
{ "-tn name", "TERM environment variable name" },
{ "-/+ulc", "turn off/on display of underline as color" },
Index: ptyx.h
--- xterm-90+/ptyx.h Sun Dec 20 22:50:38 1998
+++ xterm-91/ptyx.h Thu Jan 21 06:34:18 1999
@@ -206,7 +206,11 @@
#define MAX_DECID 420 /* ...through VT420 */
#ifndef DFT_DECID
-#define DFT_DECID 100 /* default VT100 */
+#define DFT_DECID "vt100" /* default VT100 */
+#endif
+
+#ifndef DFT_KBD_DIALECT
+#define DFT_KBD_DIALECT "B" /* default USASCII */
#endif
#define NMENUFONTS 9 /* font entries in fontMenu */
@@ -763,6 +767,7 @@
char curgl; /* Current GL setting. */
char curgr; /* Current GR setting. */
char curss; /* Current single shift. */
+ String term_id; /* resource for terminal_id */
int terminal_id; /* 100=vt100, 220=vt220, etc. */
int ansi_level; /* 0=vt100, 1,2,3 = vt100 ... vt320 */
int scroll_amt; /* amount to scroll */
Index: screen.c
--- xterm-90+/screen.c Sun Dec 20 22:50:38 1998
+++ xterm-91/screen.c Mon Jan 18 16:34:17 1999
@@ -35,6 +35,7 @@
#include <xcharmouse.h>
#include <signal.h>
+
#ifdef SVR4
#define SYSV
#include <termios.h>
@@ -54,21 +55,19 @@
#endif
#ifdef SYSV
-#if !defined(DGUX) /* Intel DG/ux uses termios.h */
+#if !defined(DGUX) /* Intel DG/ux uses termios.h */
#include <sys/termio.h>
#endif /* DGUX */
#ifdef USE_USG_PTYS
#include <sys/stream.h> /* get typedef used in ptem.h */
#include <sys/ptem.h>
#endif
-#else
-#if defined(sun) && !defined(SVR4)
+#elif defined(sun) && !defined(SVR4)
#include <sys/ttycom.h>
#ifdef TIOCSWINSZ
#undef TIOCSSIZE
#endif
#endif
-#endif
#ifdef MINIX
#include <termios.h>
@@ -810,11 +809,9 @@
int move_down_by;
#if defined(TIOCSSIZE) && (defined(sun) && !defined(SVR4))
struct ttysize ts;
-#else /* not old SunOS */
-#ifdef TIOCSWINSZ
+#elif defined(TIOCSWINSZ)
struct winsize ws;
-#endif /* TIOCSWINSZ */
-#endif /* sun */
+#endif /* sun vs TIOCSWINSZ */
Window tw = TextWindow (screen);
TRACE(("ScreenResize %dx%d\n", height, width))
@@ -942,8 +939,7 @@
kill_process_group(pgrp, SIGWINCH);
}
#endif /* SIGWINCH */
-#else /* not old SunOS */
-#ifdef TIOCSWINSZ
+#elif defined(TIOCSWINSZ)
/* Set tty's idea of window size */
ws.ws_row = rows;
ws.ws_col = cols;
@@ -961,8 +957,7 @@
#endif /* SIGWINCH */
#else
TRACE(("ScreenResize cannot do anything to pty\n"))
-#endif /* TIOCSWINSZ */
-#endif /* sun */
+#endif /* sun vs TIOCSWINSZ */
return (0);
}
Index: version.h
--- xterm-90+/version.h Sun Dec 20 22:50:38 1998
+++ xterm-91/version.h Wed Jan 20 21:20:59 1999
@@ -6,4 +6,4 @@
* version of xterm has been built. The number in parentheses is my patch
* number (T.Dickey).
*/
-#define XTERM_VERSION "XFree86 3.9Nq(90)"
+#define XTERM_VERSION "XFree86 3.9Nw(91)"
Index: xterm.h
--- xterm-90+/xterm.h Sun Dec 20 22:50:38 1998
+++ xterm-91/xterm.h Mon Jan 18 18:28:30 1999
@@ -147,7 +147,8 @@
#endif
/* charsets.c */
-extern int xtermCharSets (Char *buf, Char *ptr, char charset);
+extern unsigned xtermCharSetIn (unsigned code, int charset);
+extern int xtermCharSetOut (Char *buf, Char *ptr, char charset);
/* cursor.c */
extern void CarriageReturn (TScreen *screen);
Index: xterm.log.html
--- xterm-90+/xterm.log.html Sun Dec 20 22:50:38 1998
+++ xterm-91/xterm.log.html Thu Jan 21 06:40:40 1999
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_91">Patch #91 - 1999/1/21 - XFree86 3.9Nw</A>
<LI><A HREF="#xterm_90">Patch #90 - 1998/12/13 - XFree86 3.9Nq</A>
<LI><A HREF="#xterm_89">Patch #89 - 1998/11/20 - XFree86 3.9Nm</A>
<LI><A HREF="#xterm_88">Patch #88 - 1998/10/31 - XFree86 3.9Nk and 3.3.2h</A>
@@ -133,6 +134,19 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_91">Patch #91 - 1999/1/21 - XFree86 3.9Nw</A>/<H1>
+<ul>
+ <li>Implement logic to translate input characters which are mapped
+ when in vt220 National Replacement Character mode (requested by
+ Tomas Vanhala).
+ <li>Resync configure scripts with my patches to autoconf 2.13
+ <li>Change order of -lXmu and -lXext to accommodate cygwin32
+ (reported by Vikas Vikas Agnihotri).
+ <li>Add "-ti" option to set terminal emulation level from command
+ line rather than via resource.
+ <li>Simplify some of the preprocessor logic using #elif.
+</ul>
<H1><A NAME="xterm_90">Patch #90 - 1998/12/13 - XFree86 3.9Nq</A></H1>
This implements several small fixes and enhancements. The chief one implements
Index: xterm.man
--- xterm-90+/xterm.man Sun Jan 3 12:13:04 1999
+++ xterm-91/xterm.man Thu Jan 21 06:29:52 1999
@@ -459,6 +459,16 @@
.B \+t
This option indicates that \fIxterm\fP should start in VT102 mode.
.TP 8
+.BI \-ti " term_id"
+Specify the name used by \fIxterm\fP to select the
+correct response to terminal ID queries.
+It also specifies the emulation level,
+used to determine the type of response to a DA control sequence.
+Valid values include vt52, vt100, vt101, vt102, and vt220 (the "vt" is optional).
+The default is vt100.
+The term_id argument specifies the terminal ID to use.
+(This is the same as the \fIdecTerminalID\fP resource).
+.TP 8
.BI \-tm " string"
This option specifies a series of terminal setting keywords followed by the
characters that should be bound to those functions, similar to the \fIstty\fP