From 0044bc96bd975a938af8b558b7c5c6d70166a6054d9bab8e22731a994e552b19 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 23 Mar 2007 00:49:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=6 --- bug-246573-tentative-patch.diff | 2 +- fix-fd_option.diff | 24 - xterm-224i.patch | 12509 ++++++++++++++++++++++++++++++ xterm.changes | 8 + xterm.spec | 11 +- 5 files changed, 12526 insertions(+), 28 deletions(-) delete mode 100644 fix-fd_option.diff create mode 100644 xterm-224i.patch diff --git a/bug-246573-tentative-patch.diff b/bug-246573-tentative-patch.diff index b03c5e6..40d3d81 100644 --- a/bug-246573-tentative-patch.diff +++ b/bug-246573-tentative-patch.diff @@ -18,7 +18,7 @@ - "\xec\x9c\xa1\xec\xb9\xa0\xed\x8c\x94" \ - "\xea\xb5\xac\xec\x98\x81" - --#define HALF_WIDTH_CHAR1 0x0031 /* 'l' */ +-#define HALF_WIDTH_CHAR1 0x0031 /* '1' */ -#define HALF_WIDTH_CHAR2 0x0057 /* 'W' */ #define FULL_WIDTH_CHAR1 0x4E00 /* CJK Ideograph 'number one' */ #define FULL_WIDTH_CHAR2 0xAC00 /* Korean script syllable 'Ka' */ diff --git a/fix-fd_option.diff b/fix-fd_option.diff deleted file mode 100644 index 894649b..0000000 --- a/fix-fd_option.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru xterm-224.orig/fontutils.c xterm-224/fontutils.c ---- xterm-224.orig/fontutils.c 2007-02-04 21:31:31.000000000 +0100 -+++ xterm-224/fontutils.c 2007-02-20 12:24:05.000000000 +0100 -@@ -1520,7 +1520,7 @@ - - if ((pat = XftNameParse(xw->misc.face_name)) != 0) { - XftPatternBuild(pat, -- XFT_FAMILY, XftTypeString, "mono", -+ XFT_FAMILY, XftTypeString, "monospace", - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, - (void *) 0); -@@ -1575,9 +1575,9 @@ - face_name, - char_width)); - -- if ((pat = XftNameParse(xw->misc.face_name)) != 0) { -+ if ((pat = XftNameParse(face_name)) != 0) { - XftPatternBuild(pat, -- XFT_FAMILY, XftTypeString, face_name, -+ XFT_FAMILY, XftTypeString, "monospace", - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, - XFT_CHAR_WIDTH, XftTypeInteger, char_width, diff --git a/xterm-224i.patch b/xterm-224i.patch new file mode 100644 index 0000000..f973106 --- /dev/null +++ b/xterm-224i.patch @@ -0,0 +1,12509 @@ +# patch by Thomas E. Dickey +# created Thu Mar 15 00:45:09 UTC 2007 +# ------------------------------------------------------------------------------ +# INSTALL | 40 +# Makefile.in | 4 +# Tekproc.c | 94 +- +# XTerm.ad | 4 +# aclocal.m4 | 52 - +# button.c | 170 ++- +# cachedGCs.c | 8 +# charproc.c | 122 +- +# config.guess | 16 +# config.sub | 21 +# configure | 2285 +++++++++++++++++++++++++++-------------------------- +# configure.in | 37 +# ctlseqs.ms | 69 + +# ctlseqs.txt | 27 +# doublechr.c | 8 +# fontutils.c | 121 +- +# fontutils.h | 3 +# input.c | 10 +# main.c | 123 +- +# menu.c | 56 + +# menu.h | 13 +# misc.c | 946 +++++++++++++-------- +# os2main.c | 59 - +# ptydata.c | 44 - +# ptyx.h | 24 +# util.c | 132 +-- +# xterm-224i/doit | 2 +# xterm-224i/fixme | 71 + +# xterm.h | 35 +# xterm.log.html | 93 ++ +# xterm.man | 138 ++- +# xtermcfg.hin | 5 +# 32 files changed, 2910 insertions(+), 1922 deletions(-) +# ------------------------------------------------------------------------------ +Index: INSTALL +--- xterm-224+/INSTALL 2006-11-30 23:33:38.000000000 +0000 ++++ xterm-224i/INSTALL 2007-03-11 18:18:35.000000000 +0000 +@@ -1,7 +1,7 @@ +--- $XTermId: INSTALL,v 1.108 2006/11/30 23:33:38 tom Exp $ ++-- $XTermId: INSTALL,v 1.112 2007/03/11 18:18:35 tom Exp $ + -- $XFree86: xc/programs/xterm/INSTALL,v 3.42 2006/02/13 01:14:57 dickey Exp $ + ------------------------------------------------------------------------------- +--- Copyright 1997-2005,2006 by Thomas E. Dickey ++-- Copyright 1997-2006,2007 by Thomas E. Dickey + -- + -- All Rights Reserved + -- +@@ -240,17 +240,19 @@ + + --disable-session-mgt enable support for session management + +- Do not compile-in code which adds simple session management hooks which +- are used when closing an xterm. Normally the code is compiled-in, +- except for systems which do not support it. +- +- --disable-setuid disable setuid/setgid +- +- Do not install xterm using setuid or setgid permissions. Drop setuid +- and setgid permissions on startup. This is done if you have linked +- xterm with the utempter library, but may also be useful for systems +- where the pseudoterminal and utmp interfaces are wrapped so that xterm +- does not require these permissions. ++ Do not compile-in code which adds simple session management hooks ++ which are used when closing an xterm. Normally the code is ++ compiled-in, except for systems which do not support it. ++ ++ --disable-setgid disable setgid ++ ++ Do not install xterm using setuid/setgid permissions. Drop setgid ++ permissions on startup. ++ ++ --disable-setuid disable setuid ++ ++ Do not install xterm using setuid/setgid permissions. Drop setuid ++ permissions on startup. + + --disable-tek4014 disable tek4014 emulation + +@@ -313,6 +315,14 @@ + This allows the xterm mouse to be used with applications that use the + DEC Locator sequences, such as VAX Tpu, or SMG$ based applications. + ++ --enable-exec-xterm enable "spawn-new-terminal" action ++ ++ If your platform supports the process filesystem "cwd" link, ++ compile-in support for the "spawn-new-terminal" action, which ++ allows you to define a key translation that runs a new xterm ++ using the same working directory as the current process within ++ xterm. ++ + --enable-hp-fkeys enable support for HP-style function keys + + Compile-in code to support HP-style function keys. +@@ -581,7 +591,7 @@ + On systems with Unix98 pty's, xterm can use this library when + available so it need not be installed set-uid. + +- --with-utmp-setgid use setgid for access to utmp ++ --with-utmp-setgid=XXX use setgid for access to utmp + + The option value specifies a group to use when installing. + xterm will be installed with setgid privilege to this group. +@@ -589,3 +599,5 @@ + after opening the pseudo-terminal, and will have only the + group privilege needed to access the utmp file. This relies + on having POSIX setuid behavior. ++ ++-- vile:txtmode +Index: Makefile.in +--- xterm-224+/Makefile.in 2007-01-18 22:33:09.000000000 +0000 ++++ xterm-224i/Makefile.in 2007-03-14 21:23:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-## $XTermId: Makefile.in,v 1.138 2007/01/18 22:33:09 tom Exp $ ++## $XTermId: Makefile.in,v 1.139 2007/03/14 21:23:33 tom Exp $ + ## + ## $XFree86: xc/programs/xterm/Makefile.in,v 3.56 2006/06/19 00:36:50 dickey Exp $ ## + ## +@@ -236,7 +236,7 @@ + -$(RM) Makefile config.status config.cache config.log xtermcfg.h + + realclean : distclean +- -$(RM) tags TAGS ctlseqs.ps ctlseqs.txt ++ -$(RM) tags TAGS *.ps + + maintainer-clean : realclean + -$(RM) 256colres.h 88colres.h +Index: Tekproc.c +--- xterm-224+/Tekproc.c 2007-02-02 22:45:51.000000000 +0000 ++++ xterm-224i/Tekproc.c 2007-03-05 01:13:02.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: Tekproc.c,v 1.150 2007/02/02 22:45:51 tom Exp $ */ ++/* $XTermId: Tekproc.c,v 1.153 2007/03/05 01:13:02 tom Exp $ */ + + /* + * Warning, there be crufty dragons here. +@@ -262,7 +262,7 @@ + Fres("font2", XtCFont, tek.Tfont[TEK_FONT_2], "6x13"), + Fres("font3", XtCFont, tek.Tfont[TEK_FONT_3], "8x13"), + Fres("fontSmall", XtCFont, tek.Tfont[TEK_FONT_SMALL], DFT_FONT_SMALL), +- Sres("initialFont", "InitialFont", tek.initial_font, "large"), ++ Sres(XtNinitialFont, XtCInitialFont, tek.initial_font, "large"), + Sres("ginTerminator", "GinTerminator", tek.gin_terminator_str, GIN_TERM_NONE_STR), + #if OPT_TOOLBAR + Wres(XtNmenuBar, XtCMenuBar, tek.tb_info.menu_bar, 0), +@@ -1528,18 +1528,9 @@ + + tekscr->cur.fontsize = TEK_FONT_LARGE; + if (tw->tek.initial_font) { +- char *s = tw->tek.initial_font; +- +- if (XmuCompareISOLatin1(s, "large") == 0) +- tekscr->cur.fontsize = TEK_FONT_LARGE; +- else if (XmuCompareISOLatin1(s, "2") == 0 || +- XmuCompareISOLatin1(s, "two") == 0) +- tekscr->cur.fontsize = TEK_FONT_2; +- else if (XmuCompareISOLatin1(s, "3") == 0 || +- XmuCompareISOLatin1(s, "three") == 0) +- tekscr->cur.fontsize = TEK_FONT_3; +- else if (XmuCompareISOLatin1(s, "small") == 0) +- tekscr->cur.fontsize = TEK_FONT_SMALL; ++ int result = TekGetFontSize(tw->tek.initial_font); ++ if (result >= 0) ++ tekscr->cur.fontsize = result; + } + #define TestGIN(s) XmuCompareISOLatin1(tw->tek.gin_terminator_str, s) + +@@ -1630,36 +1621,63 @@ + return; + } + ++int ++TekGetFontSize(const char *param) ++{ ++ int result; ++ ++ if (XmuCompareISOLatin1(param, "l") == 0 || ++ XmuCompareISOLatin1(param, "large") == 0) ++ result = TEK_FONT_LARGE; ++ else if (XmuCompareISOLatin1(param, "2") == 0 || ++ XmuCompareISOLatin1(param, "two") == 0) ++ result = TEK_FONT_2; ++ else if (XmuCompareISOLatin1(param, "3") == 0 || ++ XmuCompareISOLatin1(param, "three") == 0) ++ result = TEK_FONT_3; ++ else if (XmuCompareISOLatin1(param, "s") == 0 || ++ XmuCompareISOLatin1(param, "small") == 0) ++ result = TEK_FONT_SMALL; ++ else ++ result = -1; ++ ++ return result; ++} ++ + void + TekSetFontSize(TekWidget tw, int newitem) + { +- TekScreen *tekscr = &tw->screen; +- int oldsize = tekscr->cur.fontsize; +- int newsize = MI2FS(newitem); +- Font fid; ++ if (tw != 0) { ++ TekScreen *tekscr = &tw->screen; ++ int oldsize = tekscr->cur.fontsize; ++ int newsize = MI2FS(newitem); ++ Font fid; + +- TRACE(("TekSetFontSize(%d)\n", newitem)); ++ TRACE(("TekSetFontSize(%d)\n", newitem)); ++ if (newsize < 0 || newsize >= TEKNUMFONTS) { ++ Bell(XkbBI_MinorError, 0); ++ } else if (oldsize != newsize) { ++ if (!Ttoggled) ++ TCursorToggle(tw, TOGGLE); ++ set_tekfont_menu_item(oldsize, False); + +- if (!tw || oldsize == newsize) +- return; +- if (!Ttoggled) +- TCursorToggle(tw, TOGGLE); +- set_tekfont_menu_item(oldsize, False); +- +- fid = tw->tek.Tfont[newsize]->fid; +- if (fid == DefaultGCID) +- /* we didn't succeed in opening a real font +- for this size. Instead, use server default. */ +- XCopyGC(XtDisplay(tw), +- DefaultGC(XtDisplay(tw), DefaultScreen(XtDisplay(tw))), +- GCFont, tekscr->TnormalGC); +- else +- XSetFont(XtDisplay(tw), tekscr->TnormalGC, fid); ++ fid = tw->tek.Tfont[newsize]->fid; ++ if (fid == DefaultGCID) { ++ /* we didn't succeed in opening a real font ++ for this size. Instead, use server default. */ ++ XCopyGC(XtDisplay(tw), ++ DefaultGC(XtDisplay(tw), DefaultScreen(XtDisplay(tw))), ++ GCFont, tekscr->TnormalGC); ++ } else { ++ XSetFont(XtDisplay(tw), tekscr->TnormalGC, fid); ++ } + +- tekscr->cur.fontsize = newsize; +- set_tekfont_menu_item(newsize, True); +- if (!Ttoggled) +- TCursorToggle(tw, TOGGLE); ++ tekscr->cur.fontsize = newsize; ++ set_tekfont_menu_item(newsize, True); ++ if (!Ttoggled) ++ TCursorToggle(tw, TOGGLE); ++ } ++ } + } + + void +Index: XTerm.ad +--- xterm-224+/XTerm.ad 2006-06-24 14:34:45.000000000 +0000 ++++ xterm-224i/XTerm.ad 2007-03-08 01:15:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-! $XTermId: XTerm.ad,v 1.81 2006/06/24 14:34:45 tom Exp $ ++! $XTermId: XTerm.ad,v 1.82 2007/03/08 01:15:18 tom Exp $ + ! $XFree86: xc/programs/xterm/XTerm.ad,v 3.37 2006/04/10 00:34:36 dickey Exp $ + + *saveLines: 1024 +@@ -53,8 +53,8 @@ + *vtMenu*selectToClipboard*Label: Select to Clipboard + *vtMenu*cursesemul*Label: Enable Curses Emulation + *vtMenu*visualbell*Label: Enable Visual Bell ++*vtMenu*bellIsUrgent*Label: Enable Bell Urgency + *vtMenu*poponbell*Label: Enable Pop on Bell +-*vtMenu*marginbell*Label: Enable Margin Bell + *vtMenu*cursorblink*Label: Enable Blinking Cursor + *vtMenu*titeInhibit*Label: Enable Alternate Screen Switching + *vtMenu*activeicon*Label: Enable Active Icon +Index: aclocal.m4 +--- xterm-224+/aclocal.m4 2007-02-11 14:49:56.000000000 +0000 ++++ xterm-224i/aclocal.m4 2007-03-14 20:44:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-dnl $XTermId: aclocal.m4,v 1.237 2007/02/11 14:49:56 tom Exp $ ++dnl $XTermId: aclocal.m4,v 1.240 2007/03/14 20:44:53 tom Exp $ + dnl + dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.65 2006/06/19 00:36:50 dickey Exp $ + dnl +@@ -435,7 +435,7 @@ + fi + ])])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_FUNC_TGETENT version: 10 updated: 2005/09/18 15:26:47 ++dnl CF_FUNC_TGETENT version: 11 updated: 2007/03/14 16:43:48 + dnl --------------- + dnl Check for tgetent function in termcap library. If we cannot find this, + dnl we'll use the $LINES and $COLUMNS environment variables to pass screen +@@ -491,7 +491,7 @@ + char buffer[1024]; + buffer[0] = 0; + tgetent(buffer, "$cf_TERMVAR"); +- exit($cf_TERMTST); }], ++ ${cf_cv_main_return:-return} ($cf_TERMTST); }], + [echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&AC_FD_CC + if test -n "$cf_termlib" ; then + cf_cv_lib_tgetent="-l$cf_termlib" +@@ -1205,7 +1205,7 @@ + + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_POSIX_SAVED_IDS version: 6 updated: 2006/08/02 20:37:21 ++dnl CF_POSIX_SAVED_IDS version: 7 updated: 2007/03/14 16:43:53 + dnl ------------------ + dnl + dnl Check first if saved-ids are always supported. Some systems +@@ -1245,7 +1245,7 @@ + { + void *p = (void *) seteuid; + long code = sysconf(_SC_SAVED_IDS); +- exit ((code > 0) ? 0 : 1); ++ ${cf_cv_main_return:-return} ((code > 0) ? 0 : 1); + }], + cf_cv_posix_saved_ids=yes, + cf_cv_posix_saved_ids=no, +@@ -1281,6 +1281,26 @@ + test "$cf_cv_posix_wait" = yes && AC_DEFINE(USE_POSIX_WAIT) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_PROCFS_CWD version: 2 updated: 2007/03/12 20:39:04 ++dnl ------------- ++dnl Find /proc tree (may be in a different place) which implements the "cwd" ++dnl link. ++AC_DEFUN([CF_PROCFS_CWD],[ ++AC_CACHE_CHECK(for proc tree with cwd-support,cf_cv_procfs_cwd,[ ++cf_cv_procfs_cwd=no ++for cf_path in /proc /compat/linux/proc /usr/compat/linux/proc ++do ++ if test -d $cf_path && \ ++ test -d $cf_path/$$ && \ ++ ( test -d $cf_path/$$/cwd || \ ++ test -L $cf_path/$$/cwd ); then ++ cf_cv_procfs_cwd=$cf_path ++ break ++ fi ++done ++]) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30 + dnl -------------- + dnl Check if C (preprocessor) -U and -D options are processed in the order +@@ -1667,7 +1687,7 @@ + test "$cf_cv_termio_c_ispeed" = yes && AC_DEFINE(HAVE_TERMIO_C_ISPEED) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_TTY_GROUP version: 6 updated: 2006/01/23 19:42:39 ++dnl CF_TTY_GROUP version: 7 updated: 2007/03/14 16:43:59 + dnl ------------ + dnl Check if the system has a tty-group defined. This is used in xterm when + dnl setting pty ownership. +@@ -1764,9 +1784,9 @@ + && stat(name, &sb) == 0 + && sb.st_gid != getgid() + && sb.st_gid == ttygrp->gr_gid) { +- exit(0); ++ ${cf_cv_main_return:-return} (0); + } +- exit(1); ++ ${cf_cv_main_return:-return} (1); + } + ], + [cf_cv_tty_group=yes], +@@ -1947,13 +1967,13 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_UTMP_UT_HOST version: 6 updated: 2002/10/27 23:21:42 ++dnl CF_UTMP_UT_HOST version: 7 updated: 2007/03/13 19:17:11 + dnl --------------- + dnl Check if UTMP/UTMPX struct defines ut_host member + AC_DEFUN([CF_UTMP_UT_HOST], + [ + if test $cf_cv_have_utmp != no ; then +-AC_MSG_CHECKING(if utmp.ut_host is declared) ++AC_MSG_CHECKING(if ${cf_cv_have_utmp}.ut_host is declared) + AC_CACHE_VAL(cf_cv_have_utmp_ut_host,[ + AC_TRY_COMPILE([ + #include +@@ -1967,13 +1987,13 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_UTMP_UT_NAME version: 3 updated: 2002/10/27 23:21:42 ++dnl CF_UTMP_UT_NAME version: 4 updated: 2007/03/13 19:17:11 + dnl --------------- + dnl Check if UTMP/UTMPX struct defines ut_name member + AC_DEFUN([CF_UTMP_UT_NAME], + [ + if test $cf_cv_have_utmp != no ; then +-AC_CACHE_CHECK(if utmp.ut_name is declared,cf_cv_have_utmp_ut_name,[ ++AC_CACHE_CHECK(if ${cf_cv_have_utmp}.ut_name is declared,cf_cv_have_utmp_ut_name,[ + cf_cv_have_utmp_ut_name=no + cf_utmp_includes=" + #include +@@ -2004,13 +2024,13 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_UTMP_UT_SESSION version: 4 updated: 2002/10/27 23:21:42 ++dnl CF_UTMP_UT_SESSION version: 5 updated: 2007/03/13 19:17:11 + dnl ------------------ + dnl Check if UTMP/UTMPX struct defines ut_session member + AC_DEFUN([CF_UTMP_UT_SESSION], + [ + if test $cf_cv_have_utmp != no ; then +-AC_CACHE_CHECK(if utmp.ut_session is declared, cf_cv_have_utmp_ut_session,[ ++AC_CACHE_CHECK(if ${cf_cv_have_utmp}.ut_session is declared, cf_cv_have_utmp_ut_session,[ + AC_TRY_COMPILE([ + #include + #include <${cf_cv_have_utmp}.h>], +@@ -2062,13 +2082,13 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_UTMP_UT_XTIME version: 6 updated: 2002/10/27 23:21:42 ++dnl CF_UTMP_UT_XTIME version: 7 updated: 2007/03/13 19:17:11 + dnl ---------------- + dnl Check if UTMP/UTMPX struct defines ut_xtime member + AC_DEFUN([CF_UTMP_UT_XTIME], + [ + if test $cf_cv_have_utmp != no ; then +-AC_CACHE_CHECK(if utmp.ut_xtime is declared, cf_cv_have_utmp_ut_xtime,[ ++AC_CACHE_CHECK(if ${cf_cv_have_utmp}.ut_xtime is declared, cf_cv_have_utmp_ut_xtime,[ + AC_TRY_COMPILE([ + #include + #include <${cf_cv_have_utmp}.h>], +Index: button.c +--- xterm-224+/button.c 2007-02-09 01:27:49.000000000 +0000 ++++ xterm-224i/button.c 2007-03-14 21:56:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: button.c,v 1.263 2007/02/09 01:27:49 tom Exp $ */ ++/* $XTermId: button.c,v 1.271 2007/03/14 21:56:11 tom Exp $ */ + + /* + * Copyright 1999-2006,2007 by Thomas E. Dickey +@@ -69,6 +69,7 @@ + #include + + #include ++#include + + #include + #include +@@ -1038,8 +1039,18 @@ + Time time; + }; + ++static int ++DECtoASCII(int ch) ++{ ++ if (ch < 32) { ++ ch = "###########+++++##-##++++|######"[ch]; ++ /* 01234567890123456789012345678901 */ ++ } ++ return ch; ++} + /* +- * Convert a UTF-8 string to Latin-1, replacing non Latin-1 characters by `#'. ++ * Convert a UTF-8 string to Latin-1, replacing non Latin-1 characters by `#', ++ * or ASCII/Latin-1 equivalents for special cases. + */ + #if OPT_WIDE_CHARS + static Char * +@@ -1048,37 +1059,44 @@ + static Char *buffer; + static size_t used; + +- Char *p = s; + Char *q; + + if (used == 0) { +- buffer = (Char *) XtMalloc(used = len); ++ buffer = (Char *) XtMalloc(1 + (used = len)); + } else if (len > used) { +- buffer = (Char *) XtRealloc((char *) buffer, used = len); ++ buffer = (Char *) XtRealloc((char *) buffer, 1 + (used = len)); + } +- q = buffer; + +- /* We're assuming that the xterm widget never contains Unicode +- control characters. */ ++ if (buffer != 0) { ++ PtyData data; + +- while (p < s + len) { +- if ((*p & 0x80) == 0) { +- *q++ = *p++; +- } else if ((*p & 0x7C) == 0x40 && p < s + len - 1) { +- *q++ = ((*p & 0x03) << 6) | (p[1] & 0x3F); +- p += 2; +- } else if ((*p & 0x60) == 0x40) { +- *q++ = '#'; +- p += 2; +- } else if ((*p & 0x50) == 0x40) { +- *q++ = '#'; +- p += 3; +- } else { /* this cannot happen */ +- *q++ = '#'; +- p++; ++ q = buffer; ++ fakePtyData(&data, s, s + len); ++ while (decodeUtf8(&data)) { ++ IChar value = skipPtyData(&data); ++ if (value == UCS_REPL) { ++ *q++ = '#'; ++ } else if (value < 256) { ++ *q++ = value; ++ } else { ++ unsigned eqv = ucs2dec(value); ++ if (eqv < 32) { ++ *q++ = DECtoASCII(eqv); ++ } else { ++ eqv = AsciiEquivs(value); ++ if (eqv == value) ++ eqv = '#'; ++ *q++ = eqv; ++ if (iswide(value)) ++ *q++ = ' '; ++ } ++ } + } ++ *q = 0; ++ *result = q - buffer; ++ } else { ++ *result = 0; + } +- *result = q - buffer; + return buffer; + } + #endif /* OPT_WIDE_CHARS */ +@@ -1569,9 +1587,9 @@ + + #if OPT_WIDE_CHARS + if (screen->wide_chars) { +- if (*type == XA_UTF8_STRING(XtDisplay(w)) || ++ if (*type == XA_UTF8_STRING(dpy) || + *type == XA_STRING || +- *type == XA_COMPOUND_TEXT(XtDisplay(w))) { ++ *type == XA_COMPOUND_TEXT(dpy)) { + GettingSelection(dpy, *type, line, *length); + if (Xutf8TextPropertyToTextList(dpy, &text_prop, + &text_list, +@@ -1585,16 +1603,32 @@ + { + /* Convert the selection to locale's multibyte encoding. */ + +- /* There's no need to special-case UTF8_STRING. If Xlib +- doesn't know about it, we didn't request it. If a broken +- selection holder sends it anyhow, the conversion function +- will fail. */ +- +- if (*type == XA_UTF8_STRING(XtDisplay(w)) || ++ if (*type == XA_UTF8_STRING(dpy) || + *type == XA_STRING || +- *type == XA_COMPOUND_TEXT(XtDisplay(w))) { ++ *type == XA_COMPOUND_TEXT(dpy)) { + Status rc; ++ + GettingSelection(dpy, *type, line, *length); ++ ++#if OPT_WIDE_CHARS ++ if (*type == XA_UTF8_STRING(dpy)) { ++ rc = Xutf8TextPropertyToTextList(dpy, &text_prop, ++ &text_list, &text_list_count); ++ if (text_list != NULL && text_list_count != 0) { ++ int i; ++ Char *data; ++ unsigned long size; ++ for (i = 0; i < text_list_count; ++i) { ++ data = (Char *) text_list[i]; ++ size = strlen(text_list[i]); ++ data = UTF8toLatin1(data, size, &size); ++ XFree(text_list[i]); ++ text_list[i] = XtMalloc(size + 1); ++ memcpy(text_list[i], data, size + 1); ++ } ++ } ++ } else ++#endif + if (*type == XA_STRING && screen->brokenSelections) { + rc = XTextPropertyToStringList(&text_prop, + &text_list, &text_list_count); +@@ -1801,12 +1835,13 @@ + int firstrow, + int lastrow) + { +- if (func != 0) { +- TScreen *screen = &(xw->screen); ++ TScreen *screen = &(xw->screen); ++ ++ if (screen->waitingForTrackInfo) { /* if Timed, ignore */ ++ screen->waitingForTrackInfo = False; + +- if (screen->waitingForTrackInfo) { /* if Timed, ignore */ ++ if (func != 0) { + CELL first = *start; +- screen->waitingForTrackInfo = False; + + boundsCheck(first.row); + boundsCheck(firstrow); +@@ -3069,12 +3104,12 @@ + XICCEncodingStyle conversion_style) + { + if (IsXtermWidget(w)) { +- Display *d = XtDisplay(w); ++ Display *dpy = XtDisplay(w); + TScreen *screen = TScreenOf((XtermWidget) w); + XTextProperty textprop; + char *the_data = (char *) screen->selection_data; + +- if (conversion_function(d, &the_data, 1, ++ if (conversion_function(dpy, &the_data, 1, + conversion_style, + &textprop) >= Success) { + *value = (XtPointer) textprop.value; +@@ -3096,7 +3131,7 @@ + unsigned long *length, + int *format) + { +- Display *d = XtDisplay(w); ++ Display *dpy = XtDisplay(w); + TScreen *screen; + Bool result = False; + +@@ -3108,13 +3143,13 @@ + if (screen->selection_data == NULL) + return False; /* can this happen? */ + +- if (*target == XA_TARGETS(d)) { ++ if (*target == XA_TARGETS(dpy)) { + Atom *targetP; + Atom *std_targets; + XPointer std_return = 0; + unsigned long std_length; + +- TRACE(("ConvertSelection XA_TARGETS(d)\n")); ++ TRACE(("ConvertSelection XA_TARGETS(dpy)\n")); + if (XmuConvertStandardSelection(w, screen->selection_time, selection, + target, type, &std_return, + &std_length, format)) { +@@ -3123,19 +3158,19 @@ + targetP = (Atom *) XtMalloc(sizeof(Atom) * (*length)); + *value = (XtPointer) targetP; + *targetP++ = XA_STRING; +- *targetP++ = XA_TEXT(d); ++ *targetP++ = XA_TEXT(dpy); + #ifdef X_HAVE_UTF8_STRING +- *targetP++ = XA_COMPOUND_TEXT(d); +- *targetP++ = XA_UTF8_STRING(d); ++ *targetP++ = XA_COMPOUND_TEXT(dpy); ++ *targetP++ = XA_UTF8_STRING(dpy); + #else +- *targetP = XA_COMPOUND_TEXT(d); ++ *targetP = XA_COMPOUND_TEXT(dpy); + if_OPT_WIDE_CHARS(screen, { +- *targetP = XA_UTF8_STRING(d); ++ *targetP = XA_UTF8_STRING(dpy); + }); + targetP++; + #endif +- *targetP++ = XA_LENGTH(d); +- *targetP++ = XA_LIST_LENGTH(d); ++ *targetP++ = XA_LENGTH(dpy); ++ *targetP++ = XA_LIST_LENGTH(dpy); + memcpy(targetP, std_targets, sizeof(Atom) * std_length); + XtFree((char *) std_targets); + *type = XA_ATOM; +@@ -3151,22 +3186,22 @@ + type, value, length, format, + Xutf8TextListToTextProperty, + XStringStyle); +- } else if (screen->wide_chars && *target == XA_UTF8_STRING(d)) { +- TRACE(("ConvertSelection XA_UTF8_STRING(d) - wide\n")); ++ } else if (screen->wide_chars && *target == XA_UTF8_STRING(dpy)) { ++ TRACE(("ConvertSelection XA_UTF8_STRING(dpy) - wide\n")); + result = + _ConvertSelectionHelper(w, + type, value, length, format, + Xutf8TextListToTextProperty, + XUTF8StringStyle); +- } else if (screen->wide_chars && *target == XA_TEXT(d)) { +- TRACE(("ConvertSelection XA_TEXT(d) - wide\n")); ++ } else if (screen->wide_chars && *target == XA_TEXT(dpy)) { ++ TRACE(("ConvertSelection XA_TEXT(dpy) - wide\n")); + result = + _ConvertSelectionHelper(w, + type, value, length, format, + Xutf8TextListToTextProperty, + XStdICCTextStyle); +- } else if (screen->wide_chars && *target == XA_COMPOUND_TEXT(d)) { +- TRACE(("ConvertSelection XA_COMPOUND_TEXT(d) - wide\n")); ++ } else if (screen->wide_chars && *target == XA_COMPOUND_TEXT(dpy)) { ++ TRACE(("ConvertSelection XA_COMPOUND_TEXT(dpy) - wide\n")); + result = + _ConvertSelectionHelper(w, + type, value, length, format, +@@ -3188,15 +3223,15 @@ + *length = screen->selection_length; + *format = 8; + result = True; +- } else if (*target == XA_TEXT(d)) { /* not wide_chars */ +- TRACE(("ConvertSelection XA_TEXT(d)\n")); ++ } else if (*target == XA_TEXT(dpy)) { /* not wide_chars */ ++ TRACE(("ConvertSelection XA_TEXT(dpy)\n")); + result = + _ConvertSelectionHelper(w, + type, value, length, format, + XmbTextListToTextProperty, + XStdICCTextStyle); +- } else if (*target == XA_COMPOUND_TEXT(d)) { /* not wide_chars */ +- TRACE(("ConvertSelection XA_COMPOUND_TEXT(d)\n")); ++ } else if (*target == XA_COMPOUND_TEXT(dpy)) { /* not wide_chars */ ++ TRACE(("ConvertSelection XA_COMPOUND_TEXT(dpy)\n")); + result = + _ConvertSelectionHelper(w, + type, value, length, format, +@@ -3204,8 +3239,8 @@ + XCompoundTextStyle); + } + #ifdef X_HAVE_UTF8_STRING +- else if (*target == XA_UTF8_STRING(d)) { /* not wide_chars */ +- TRACE(("ConvertSelection XA_UTF8_STRING(d)\n")); ++ else if (*target == XA_UTF8_STRING(dpy)) { /* not wide_chars */ ++ TRACE(("ConvertSelection XA_UTF8_STRING(dpy)\n")); + result = + _ConvertSelectionHelper(w, + type, value, length, format, +@@ -3213,8 +3248,8 @@ + XUTF8StringStyle); + } + #endif +- else if (*target == XA_LIST_LENGTH(d)) { +- TRACE(("ConvertSelection XA_LIST_LENGTH(d)\n")); ++ else if (*target == XA_LIST_LENGTH(dpy)) { ++ TRACE(("ConvertSelection XA_LIST_LENGTH(dpy)\n")); + *value = XtMalloc(4); + if (sizeof(long) == 4) + *(long *) *value = 1; +@@ -3226,8 +3261,8 @@ + *length = 1; + *format = 32; + result = True; +- } else if (*target == XA_LENGTH(d)) { +- TRACE(("ConvertSelection XA_LENGTH(d)\n")); ++ } else if (*target == XA_LENGTH(dpy)) { ++ TRACE(("ConvertSelection XA_LENGTH(dpy)\n")); + /* This value is wrong if we have UTF-8 text */ + *value = XtMalloc(4); + if (sizeof(long) == 4) { +@@ -3486,10 +3521,7 @@ + if (c == 0) { + c = E2A(' '); + } else if (c < E2A(' ')) { +- if (c == XPOUND) +- c = 0x23; /* char on screen is pound sterling */ +- else +- c += 0x5f; /* char is from DEC drawing set */ ++ c = DECtoASCII(c); + } else if (c == 0x7f) { + c = 0x5f; + } +Index: cachedGCs.c +--- xterm-224+/cachedGCs.c 2007-02-11 21:45:28.000000000 +0000 ++++ xterm-224i/cachedGCs.c 2007-03-14 00:17:16.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: cachedGCs.c,v 1.30 2007/02/11 21:45:28 tom Exp $ */ ++/* $XTermId: cachedGCs.c,v 1.32 2007/03/14 00:17:16 tom Exp $ */ + + /************************************************************ + +@@ -195,6 +195,7 @@ + #endif + #if OPT_HIGHLIGHT_COLOR + CASE(HIGHLIGHT_BG), ++ CASE(HIGHLIGHT_FG), + #endif + #if OPT_TEK4014 + CASE(TEK_CURSOR), +@@ -463,7 +464,10 @@ + if (font == 0) { + if (cgsId != gcNorm) + (void) getCgsGC(xw, cgsWin, gcNorm); +- font = xw->screen.fnts[fNorm]; ++ if (cgsWin == &(xw->screen.iconVwin)) ++ font = xw->screen.fnt_icon; ++ else ++ font = xw->screen.fnts[fNorm]; + } + if (okFont(font) && !SameFont(NEXT(font), font)) { + TRACE2(("...updated next font for %s to %s\n", +Index: charproc.c +--- xterm-224+/charproc.c 2007-02-11 15:22:25.000000000 +0000 ++++ xterm-224i/charproc.c 2007-03-15 00:37:25.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: charproc.c,v 1.766 2007/02/11 15:22:25 tom Exp $ */ ++/* $XTermId: charproc.c,v 1.781 2007/03/15 00:37:25 tom Exp $ */ + + /* $XFree86: xc/programs/xterm/charproc.c,v 3.185 2006/06/20 00:42:38 dickey Exp $ */ + +@@ -302,10 +302,12 @@ + { "set-autolinefeed", HandleAutoLineFeed }, + { "set-autowrap", HandleAutoWrap }, + { "set-backarrow", HandleBackarrow }, ++ { "set-bellIsUrgent", HandleBellIsUrgent }, + { "set-cursesemul", HandleCursesEmul }, + { "set-jumpscroll", HandleJumpscroll }, +- { "set-old-function-keys", HandleOldFunctionKeys }, + { "set-marginbell", HandleMarginBell }, ++ { "set-old-function-keys", HandleOldFunctionKeys }, ++ { "set-pop-on-bell", HandleSetPopOnBell }, + { "set-reverse-video", HandleReverseVideo }, + { "set-reversewrap", HandleReverseWrap }, + { "set-scroll-on-key", HandleScrollKey }, +@@ -315,7 +317,6 @@ + { "set-sun-keyboard", HandleSunKeyboard }, + { "set-titeInhibit", HandleTiteInhibit }, + { "set-visual-bell", HandleSetVisualBell }, +- { "set-pop-on-bell", HandleSetPopOnBell }, + { "set-vt-font", HandleSetFont }, + { "soft-reset", HandleSoftReset }, + { "start-cursor-extend", HandleKeyboardStartExtend }, +@@ -341,6 +342,9 @@ + #if OPT_DEC_SOFTFONT + { "set-font-loading", HandleFontLoading }, + #endif ++#if OPT_EXEC_XTERM ++ { "spawn-new-terminal", HandleSpawnTerminal }, ++#endif + #if OPT_HP_FUNC_KEYS + { "set-hp-function-keys", HandleHpFunctionKeys }, + #endif +@@ -396,6 +400,9 @@ + { + Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False), + Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True), ++ Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False), ++ Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False), ++ Bres(XtNalwaysBoldMode, XtCAlwaysBoldMode, screen.always_bold_mode, False), + Bres(XtNalwaysHighlight, XtCAlwaysHighlight, screen.always_highlight, False), + Bres(XtNappcursorDefault, XtCAppcursorDefault, misc.appcursorDefault, False), + Bres(XtNappkeypadDefault, XtCAppkeypadDefault, misc.appkeypadDefault, False), +@@ -403,6 +410,7 @@ + Bres(XtNawaitInput, XtCAwaitInput, screen.awaitInput, False), + Bres(XtNfreeBoldBox, XtCFreeBoldBox, screen.free_bold_box, False), + Bres(XtNbackarrowKey, XtCBackarrowKey, screen.backarrow_key, True), ++ Bres(XtNbellIsUrgent, XtCBellIsUrgent, screen.bellIsUrgent, False), + Bres(XtNbellOnReset, XtCBellOnReset, screen.bellOnReset, True), + Bres(XtNboldMode, XtCBoldMode, screen.bold_mode, True), + Bres(XtNbrokenSelections, XtCBrokenSelections, screen.brokenSelections, False), +@@ -456,6 +464,7 @@ + Ires(XtNscrollBarBorder, XtCScrollBarBorder, screen.scrollBarBorder, 1), + Ires(XtNscrollLines, XtCScrollLines, screen.scrolllines, SCROLLLINES), + ++ Sres(XtNinitialFont, XtCInitialFont, screen.initial_font, NULL), + Sres(XtNfont1, XtCFont1, screen.MenuFontName(fontMenu_font1), NULL), + Sres(XtNfont2, XtCFont2, screen.MenuFontName(fontMenu_font2), NULL), + Sres(XtNfont3, XtCFont3, screen.MenuFontName(fontMenu_font3), NULL), +@@ -536,6 +545,7 @@ + + #if OPT_HIGHLIGHT_COLOR + Tres(XtNhighlightColor, XtCHighlightColor, HIGHLIGHT_BG, XtDefaultForeground), ++ Tres(XtNhighlightTextColor, XtCHighlightTextColor, HIGHLIGHT_FG, XtDefaultBackground), + #endif /* OPT_HIGHLIGHT_COLOR */ + + #if OPT_INPUT_METHOD +@@ -1195,7 +1205,8 @@ + fprintf(stderr, + "do_precomposition (U+%04X [%d], U+%04X [%d]) -> U+%04X [%d]\n", + prev, my_wcwidth(prev), (int) c, my_wcwidth((int) +- c), precomposed, my_wcwidth(precomposed)); ++ c), ++ precomposed, my_wcwidth(precomposed)); + } + #endif + +@@ -2718,6 +2729,7 @@ + case CASE_REP: + TRACE(("CASE_REP\n")); + if (sp->lastchar >= 0 && ++ sp->lastchar < 256 && + sp->groundtable[E2A(sp->lastchar)] == CASE_PRINT) { + IChar repeated[2]; + count = (param[0] < 1) ? 1 : param[0]; +@@ -3837,7 +3849,7 @@ + int i, j; + + for (i = 0; i < nparam; ++i) { +- TRACE(("%s %d\n", IsSM() ? "DECSET" : "DECRST", param[i])); ++ TRACE(("%s %d\n", IsSM()? "DECSET" : "DECRST", param[i])); + switch (param[i]) { + case 1: /* DECCKM */ + (*func) (&xw->keyboard.flags, MODE_DECCKM); +@@ -3871,7 +3883,7 @@ + if (screen->c132) { + ClearScreen(xw); + CursorSet(screen, 0, 0, xw->flags); +- if ((j = IsSM() ? 132 : 80) != ++ if ((j = IsSM()? 132 : 80) != + ((xw->flags & IN132COLUMNS) ? 132 : 80) || + j != MaxCols(screen)) + RequestResize(xw, -1, j, True); +@@ -3922,7 +3934,10 @@ + #endif + #if OPT_BLINK_CURS + case 12: /* att610: Start/stop blinking cursor */ +- SetCursorBlink(screen, IsSM()); ++ if (screen->cursor_blink_res) { ++ set_bool_mode(screen->cursor_blink_esc); ++ SetCursorBlink(screen, screen->cursor_blink); ++ } + break; + #endif + case 18: /* DECPFF: print form feed */ +@@ -3935,7 +3950,7 @@ + set_bool_mode(screen->cursor_set); + break; + case 30: /* rxvt */ +- if (screen->fullVwin.sb_info.width != (IsSM() ? ON : OFF)) ++ if (screen->fullVwin.sb_info.width != (IsSM()? ON : OFF)) + ToggleScrollBar(xw); + break; + #if OPT_SHIFT_FONTS +@@ -4006,6 +4021,7 @@ + } + break; + case 1047: ++ /* FALLTHRU */ + case 47: /* alternate buffer */ + if (!xw->misc.titeInhibit) { + if (IsSM()) { +@@ -4167,7 +4183,6 @@ + case 6: /* DECOM */ + DoSM(DP_DECOM, xw->flags & ORIGIN); + break; +- + case 7: /* DECAWM */ + DoSM(DP_DECAWM, xw->flags & WRAPAROUND); + break; +@@ -4204,6 +4219,9 @@ + case 41: /* curses hack */ + DoSM(DP_X_MORE, screen->curses); + break; ++ case 42: /* DECNRCM national charset (VT220) */ ++ /* do nothing */ ++ break; + case 44: /* margin bell */ + DoSM(DP_X_MARGIN, screen->marginbell); + break; +@@ -5457,6 +5475,7 @@ + #ifdef ALLOWLOGGING + init_Sres(screen.logfile); + #endif ++ init_Bres(screen.bellIsUrgent); + init_Bres(screen.bellOnReset); + init_Bres(screen.marginbell); + init_Bres(screen.multiscroll); +@@ -5541,6 +5560,8 @@ + init_Bres(screen.output_eight_bits); + init_Bres(screen.control_eight_bits); + init_Bres(screen.backarrow_key); ++ init_Bres(screen.alt_is_not_meta); ++ init_Bres(screen.alt_sends_esc); + init_Bres(screen.meta_sends_esc); + + init_Bres(screen.allowSendEvent0); +@@ -5562,12 +5583,17 @@ + for (i = fontMenu_font1; i <= fontMenu_lastBuiltin; i++) { + init_Sres(screen.MenuFontName(i)); + } +- /* set default in realize proc */ +- wnew->screen.MenuFontName(fontMenu_fontdefault) = NULL; ++ wnew->screen.MenuFontName(fontMenu_default) = wnew->misc.default_font.f_n; + wnew->screen.MenuFontName(fontMenu_fontescape) = NULL; + wnew->screen.MenuFontName(fontMenu_fontsel) = NULL; +- wnew->screen.menu_font_number = fontMenu_fontdefault; + ++ wnew->screen.menu_font_number = fontMenu_default; ++ init_Sres(screen.initial_font); ++ if (wnew->screen.initial_font != 0) { ++ int result = xtermGetFont(wnew->screen.initial_font); ++ if (result >= 0) ++ wnew->screen.menu_font_number = result; ++ } + #if OPT_BROKEN_OSC + init_Bres(screen.brokenLinuxOSC); + #endif +@@ -5716,6 +5742,7 @@ + init_Tres(TEXT_CURSOR); + #if OPT_HIGHLIGHT_COLOR + init_Tres(HIGHLIGHT_BG); ++ init_Tres(HIGHLIGHT_FG); + #endif + + #if OPT_TEK4014 +@@ -5802,6 +5829,7 @@ + + 1); + #endif /* OPT_WIDE_CHARS */ + ++ init_Bres(screen.always_bold_mode); + init_Bres(screen.bold_mode); + init_Bres(screen.underline); + +@@ -6022,6 +6050,7 @@ + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &xw->screen; + ++ const VTFontNames *myfont; + unsigned width, height; + int xpos, ypos, pr; + Atom pid_atom; +@@ -6031,20 +6060,26 @@ + + TabReset(xw->tabs); + +- screen->MenuFontName(fontMenu_fontdefault) = xw->misc.default_font.f_n; ++ if (screen->menu_font_number == fontMenu_default) { ++ myfont = &(xw->misc.default_font); ++ } else { ++ myfont = xtermFontName(screen->MenuFontName(screen->menu_font_number)); ++ } + memset(screen->fnts, 0, sizeof(screen->fnts)); + + if (!xtermLoadFont(xw, +- &(xw->misc.default_font), +- False, 0)) { +- if (XmuCompareISOLatin1(xw->misc.default_font.f_n, "fixed") != 0) { ++ myfont, ++ False, ++ screen->menu_font_number)) { ++ if (XmuCompareISOLatin1(myfont->f_n, DEFFONT) != 0) { + fprintf(stderr, +- "%s: unable to open font \"%s\", trying \"fixed\"....\n", +- xterm_name, xw->misc.default_font.f_n); ++ "%s: unable to open font \"%s\", trying \"%s\"....\n", ++ xterm_name, myfont->f_n, DEFFONT); + (void) xtermLoadFont(xw, +- xtermFontName("fixed"), +- False, 0); +- screen->MenuFontName(fontMenu_fontdefault) = "fixed"; ++ xtermFontName(DEFFONT), ++ False, ++ screen->menu_font_number); ++ screen->MenuFontName(screen->menu_font_number) = DEFFONT; + } + } + +@@ -6593,7 +6628,7 @@ + newvt->screen.MenuFontName(newvt->screen.menu_font_number)) || + (curvt->misc.default_font.f_n != newvt->misc.default_font.f_n)) { + if (curvt->misc.default_font.f_n != newvt->misc.default_font.f_n) +- newvt->screen.MenuFontName(fontMenu_fontdefault) = newvt->misc.default_font.f_n; ++ newvt->screen.MenuFontName(fontMenu_default) = newvt->misc.default_font.f_n; + if (xtermLoadFont(newvt, + xtermFontName(newvt->screen.MenuFontName(curvt->screen.menu_font_number)), + True, newvt->screen.menu_font_number)) { +@@ -6601,7 +6636,7 @@ + refresh_needed = True; + fonts_redone = True; + } else if (curvt->misc.default_font.f_n != newvt->misc.default_font.f_n) +- newvt->screen.MenuFontName(fontMenu_fontdefault) = curvt->misc.default_font.f_n; ++ newvt->screen.MenuFontName(fontMenu_default) = curvt->misc.default_font.f_n; + } + if (!fonts_redone + && (T_COLOR(&(curvt->screen), TEXT_CURSOR) != +@@ -6665,7 +6700,8 @@ + Pixel bg_pix; + Pixel tmp; + #if OPT_HIGHLIGHT_COLOR +- Pixel hi_pix = T_COLOR(screen, HIGHLIGHT_BG); ++ Pixel selbg_pix = T_COLOR(screen, HIGHLIGHT_BG); ++ Pixel selfg_pix = T_COLOR(screen, HIGHLIGHT_FG); + #endif + #if OPT_WIDE_CHARS + Char chi = 0; +@@ -6779,12 +6815,14 @@ + } + } + #if OPT_HIGHLIGHT_COLOR +- if (hi_pix != T_COLOR(screen, TEXT_FG) +- && hi_pix != fg_pix +- && hi_pix != bg_pix +- && hi_pix != xw->dft_foreground) { +- bg_pix = fg_pix; +- fg_pix = hi_pix; ++ { ++ Bool use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); ++ Bool use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); ++ ++ if (use_selbg) ++ fg_pix = selbg_pix; ++ if (use_selfg) ++ bg_pix = selfg_pix; + } + #endif + EXCHANGE(fg_pix, bg_pix, tmp); +@@ -6806,12 +6844,14 @@ + } else { /* not selected */ + if (reversed) { /* text is reverse video */ + #if OPT_HIGHLIGHT_COLOR +- if (hi_pix != T_COLOR(screen, TEXT_FG) +- && hi_pix != fg_pix +- && hi_pix != bg_pix +- && hi_pix != xw->dft_foreground) { +- bg_pix = fg_pix; +- fg_pix = hi_pix; ++ { ++ Bool use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); ++ Bool use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); ++ ++ if (use_selbg) ++ fg_pix = selbg_pix; ++ if (use_selfg) ++ bg_pix = selfg_pix; + } + #endif + setGC(gcNormReverse); +@@ -6854,13 +6894,13 @@ + #endif + + if (!filled) { ++ GC outlineGC = getCgsGC(xw, currentWin, gcVTcursOutline); ++ if (outlineGC == 0) ++ outlineGC = currentGC; ++ + screen->box->x = x; + screen->box->y = y; +- XDrawLines(screen->display, VWindow(screen), +- getCgsGC(xw, currentWin, +- (getCgsGC(xw, currentWin, gcVTcursOutline) +- ? gcVTcursOutline +- : currentCgs)), ++ XDrawLines(screen->display, VWindow(screen), outlineGC, + screen->box, NBOX, CoordModePrevious); + } + } +Index: config.guess +--- xterm-224+/config.guess 2006-07-22 15:57:37.000000000 +0000 ++++ xterm-224i/config.guess 2006-12-22 17:00:00.000000000 +0000 +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + # Inc. + +-timestamp='2006-07-02' ++timestamp='2006-12-22' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -161,6 +161,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -780,7 +781,7 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; +- i*:MINGW*:*) ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) +@@ -793,7 +794,7 @@ + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T:Interix*:[3456]*) ++ EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) +@@ -950,6 +951,9 @@ + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; ++ xtensa:Linux:*:*) ++ echo xtensa-unknown-linux-gnu ++ exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent +@@ -1208,6 +1212,12 @@ + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; +Index: config.sub +--- xterm-224+/config.sub 2006-07-22 15:57:29.000000000 +0000 ++++ xterm-224i/config.sub 2006-12-08 17:00:00.000000000 +0000 +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + # Inc. + +-timestamp='2006-07-02' ++timestamp='2006-12-08' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -245,7 +245,7 @@ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +- | fr30 | frv \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +@@ -276,6 +276,7 @@ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ ++ | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ +@@ -284,7 +285,7 @@ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; +@@ -323,7 +324,7 @@ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ +@@ -367,7 +368,7 @@ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) +@@ -909,6 +910,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -920,6 +925,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -1366,6 +1374,9 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; + spu-*) + os=-elf + ;; +Index: configure +--- xterm-224+/configure 2007-01-29 23:42:51.000000000 +0000 ++++ xterm-224i/configure 2007-03-14 21:13:59.000000000 +0000 +@@ -686,7 +686,8 @@ + --with-app-defaults=DIR directory in which to install resource files (default: EPREFIX/lib/X11/app-defaults) + --with-reference=XXX program to use as permissions-reference + --with-xterm-symlink=XXX make symbolic link to installed xterm +- --disable-setuid disable setuid in xterm, do not install setuid ++ --disable-setuid disable setuid in xterm, do not install setuid/setgid ++ --disable-setgid disable setgid in xterm, do not install setuid/setgid + --with-setuid=XXX use the given setuid user + --with-utmp-setgid=XXX use setgid to match utmp/utmpx file + --with-utempter use utempter library for access to utmp +@@ -717,6 +718,7 @@ + --disable-highlighting disable support for color highlighting + --disable-doublechars disable support for double-size chars + --disable-boxchars disable fallback-support for box chars ++ --enable-exec-xterm enable "spawn-new-terminal" action + --disable-freetype disable freetype library-support + --with-freetype-cflags -D/-I options for compiling with FreeType + --with-freetype-libs -L/-l options to link FreeType +@@ -949,7 +951,7 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- { echo "$as_me:952: loading site script $ac_site_file" >&5 ++ { echo "$as_me:954: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" +@@ -960,7 +962,7 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { echo "$as_me:963: loading cache $cache_file" >&5 ++ { echo "$as_me:965: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -968,7 +970,7 @@ + esac + fi + else +- { echo "$as_me:971: creating cache $cache_file" >&5 ++ { echo "$as_me:973: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -984,21 +986,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:987: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:989: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { echo "$as_me:991: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:993: error: \`$ac_var' was not set in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:997: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:999: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:999: former value: $ac_old_val" >&5 ++ { echo "$as_me:1001: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:1001: current value: $ac_new_val" >&5 ++ { echo "$as_me:1003: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -1017,9 +1019,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:1020: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:1022: error: changes in the environment can compromise the build" >&5 + echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:1022: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:1024: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1040,10 +1042,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:1043: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:1045: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:1046: \$? = $ac_status" >&5 ++ echo "$as_me:1048: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -1071,7 +1073,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1074: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:1076: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1081,11 +1083,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1084: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1086: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1088: checking build system type" >&5 ++echo "$as_me:1090: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1094,16 +1096,16 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1097: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1099: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:1101: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1103: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1106: result: $ac_cv_build" >&5 ++echo "$as_me:1108: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1111,7 +1113,7 @@ + build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then +- echo "$as_me:1114: checking host system type" >&5 ++ echo "$as_me:1116: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1120,12 +1122,12 @@ + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:1123: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1125: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1128: result: $ac_cv_host" >&5 ++echo "$as_me:1130: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1150,13 +1152,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1153: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1155: result: Configuring for $cf_cv_system_name" >&5 + echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 + + if test ".$system_name" != ".$cf_cv_system_name" ; then +- echo "$as_me:1157: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1159: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 +- { { echo "$as_me:1159: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1161: error: \"Please remove config.cache and try again.\"" >&5 + echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1181,7 +1183,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:1184: checking for $ac_word" >&5 ++echo "$as_me:1186: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1196,7 +1198,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="${ac_tool_prefix}gcc" +-echo "$as_me:1199: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1201: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1204,10 +1206,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1207: result: $CC" >&5 ++ echo "$as_me:1209: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1210: result: no" >&5 ++ echo "$as_me:1212: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1216,7 +1218,7 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo "$as_me:1219: checking for $ac_word" >&5 ++echo "$as_me:1221: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1231,7 +1233,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="gcc" +-echo "$as_me:1234: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1236: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1239,10 +1241,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1242: result: $ac_ct_CC" >&5 ++ echo "$as_me:1244: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1245: result: no" >&5 ++ echo "$as_me:1247: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1255,7 +1257,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:1258: checking for $ac_word" >&5 ++echo "$as_me:1260: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1270,7 +1272,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="${ac_tool_prefix}cc" +-echo "$as_me:1273: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1275: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1278,10 +1280,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1281: result: $CC" >&5 ++ echo "$as_me:1283: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1284: result: no" >&5 ++ echo "$as_me:1286: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1290,7 +1292,7 @@ + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:1293: checking for $ac_word" >&5 ++echo "$as_me:1295: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1305,7 +1307,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="cc" +-echo "$as_me:1308: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1310: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1313,10 +1315,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1316: result: $ac_ct_CC" >&5 ++ echo "$as_me:1318: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1319: result: no" >&5 ++ echo "$as_me:1321: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1329,7 +1331,7 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:1332: checking for $ac_word" >&5 ++echo "$as_me:1334: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1349,7 +1351,7 @@ + continue + fi + ac_cv_prog_CC="cc" +-echo "$as_me:1352: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1354: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1371,10 +1373,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1374: result: $CC" >&5 ++ echo "$as_me:1376: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1377: result: no" >&5 ++ echo "$as_me:1379: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1385,7 +1387,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:1388: checking for $ac_word" >&5 ++echo "$as_me:1390: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1400,7 +1402,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +-echo "$as_me:1403: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1405: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1408,10 +1410,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1411: result: $CC" >&5 ++ echo "$as_me:1413: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1414: result: no" >&5 ++ echo "$as_me:1416: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1424,7 +1426,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:1427: checking for $ac_word" >&5 ++echo "$as_me:1429: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1439,7 +1441,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="$ac_prog" +-echo "$as_me:1442: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1444: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1447,10 +1449,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1450: result: $ac_ct_CC" >&5 ++ echo "$as_me:1452: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1453: result: no" >&5 ++ echo "$as_me:1455: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1462,32 +1464,32 @@ + + fi + +-test -z "$CC" && { { echo "$as_me:1465: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1467: error: no acceptable cc found in \$PATH" >&5 + echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-echo "$as_me:1470:" \ ++echo "$as_me:1472:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1473: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:1475: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:1476: \$? = $ac_status" >&5 ++ echo "$as_me:1478: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1478: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:1480: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:1481: \$? = $ac_status" >&5 ++ echo "$as_me:1483: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1483: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:1485: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:1486: \$? = $ac_status" >&5 ++ echo "$as_me:1488: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1490 "configure" ++#line 1492 "configure" + #include "confdefs.h" + + int +@@ -1503,13 +1505,13 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:1506: checking for C compiler default output" >&5 ++echo "$as_me:1508: checking for C compiler default output" >&5 + echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:1509: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1511: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1512: \$? = $ac_status" >&5 ++ echo "$as_me:1514: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is + # not robust to junk in `.', hence go to wildcards (a.*) only as a last +@@ -1532,34 +1534,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1535: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1537: error: C compiler cannot create executables" >&5 + echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:1541: result: $ac_file" >&5 ++echo "$as_me:1543: result: $ac_file" >&5 + echo "${ECHO_T}$ac_file" >&6 + + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1546: checking whether the C compiler works" >&5 ++echo "$as_me:1548: checking whether the C compiler works" >&5 + echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (eval echo "$as_me:1552: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1555: \$? = $ac_status" >&5 ++ echo "$as_me:1557: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1562: error: cannot run C compiled programs. ++ { { echo "$as_me:1564: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&5 + echo "$as_me: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&2;} +@@ -1567,24 +1569,24 @@ + fi + fi + fi +-echo "$as_me:1570: result: yes" >&5 ++echo "$as_me:1572: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + + rm -f a.out a.exe conftest$ac_cv_exeext + ac_clean_files=$ac_clean_files_save + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1577: checking whether we are cross compiling" >&5 ++echo "$as_me:1579: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1579: result: $cross_compiling" >&5 ++echo "$as_me:1581: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1582: checking for executable suffix" >&5 ++echo "$as_me:1584: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1584: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1586: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1587: \$? = $ac_status" >&5 ++ echo "$as_me:1589: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -1600,25 +1602,25 @@ + esac + done + else +- { { echo "$as_me:1603: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1605: error: cannot compute EXEEXT: cannot compile and link" >&5 + echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:1609: result: $ac_cv_exeext" >&5 ++echo "$as_me:1611: result: $ac_cv_exeext" >&5 + echo "${ECHO_T}$ac_cv_exeext" >&6 + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:1615: checking for object suffix" >&5 ++echo "$as_me:1617: checking for object suffix" >&5 + echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1621 "configure" ++#line 1623 "configure" + #include "confdefs.h" + + int +@@ -1630,10 +1632,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1633: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1635: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1636: \$? = $ac_status" >&5 ++ echo "$as_me:1638: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in +@@ -1645,24 +1647,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1648: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1650: error: cannot compute OBJEXT: cannot compile" >&5 + echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:1655: result: $ac_cv_objext" >&5 ++echo "$as_me:1657: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1659: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1661: checking whether we are using the GNU C compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1665 "configure" ++#line 1667 "configure" + #include "confdefs.h" + + int +@@ -1677,16 +1679,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1680: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1682: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1683: \$? = $ac_status" >&5 ++ echo "$as_me:1685: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1686: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1688: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1689: \$? = $ac_status" >&5 ++ echo "$as_me:1691: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1698,19 +1700,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1701: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1703: result: $ac_cv_c_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + CFLAGS="-g" +-echo "$as_me:1707: checking whether $CC accepts -g" >&5 ++echo "$as_me:1709: checking whether $CC accepts -g" >&5 + echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1713 "configure" ++#line 1715 "configure" + #include "confdefs.h" + + int +@@ -1722,16 +1724,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1725: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1728: \$? = $ac_status" >&5 ++ echo "$as_me:1730: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1731: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1734: \$? = $ac_status" >&5 ++ echo "$as_me:1736: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1741,7 +1743,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1744: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:1746: result: $ac_cv_prog_cc_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -1768,16 +1770,16 @@ + #endif + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1771: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1773: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1774: \$? = $ac_status" >&5 ++ echo "$as_me:1776: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1777: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1779: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1780: \$? = $ac_status" >&5 ++ echo "$as_me:1782: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ +@@ -1789,7 +1791,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 1792 "configure" ++#line 1794 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -1802,16 +1804,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1805: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1807: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1808: \$? = $ac_status" >&5 ++ echo "$as_me:1810: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1813: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1814: \$? = $ac_status" >&5 ++ echo "$as_me:1816: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -1821,7 +1823,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 1824 "configure" ++#line 1826 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -1833,16 +1835,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1836: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1838: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1839: \$? = $ac_status" >&5 ++ echo "$as_me:1841: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1842: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1844: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1845: \$? = $ac_status" >&5 ++ echo "$as_me:1847: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -1876,7 +1878,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return +-echo "$as_me:1879: checking how to run the C preprocessor" >&5 ++echo "$as_me:1881: checking how to run the C preprocessor" >&5 + echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then +@@ -1897,18 +1899,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1900 "configure" ++#line 1902 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:1905: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1907: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1911: \$? = $ac_status" >&5 ++ echo "$as_me:1913: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1931,17 +1933,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 1934 "configure" ++#line 1936 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:1938: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1940: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1944: \$? = $ac_status" >&5 ++ echo "$as_me:1946: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1978,7 +1980,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:1981: result: $CPP" >&5 ++echo "$as_me:1983: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -1988,18 +1990,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1991 "configure" ++#line 1993 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:1996: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1998: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2002: \$? = $ac_status" >&5 ++ echo "$as_me:2004: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2022,17 +2024,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2025 "configure" ++#line 2027 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2029: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2031: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2035: \$? = $ac_status" >&5 ++ echo "$as_me:2037: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2060,7 +2062,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2063: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:2065: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2073,14 +2075,14 @@ + ac_main_return=return + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:2076: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:2078: checking whether $CC needs -traditional" >&5 + echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 + if test "${ac_cv_prog_gcc_traditional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_pattern="Autoconf.*'x'" + cat >conftest.$ac_ext <<_ACEOF +-#line 2083 "configure" ++#line 2085 "configure" + #include "confdefs.h" + #include + int Autoconf = TIOCGETP; +@@ -2095,7 +2097,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +-#line 2098 "configure" ++#line 2100 "configure" + #include "confdefs.h" + #include + int Autoconf = TCGETA; +@@ -2108,7 +2110,7 @@ + + fi + fi +-echo "$as_me:2111: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:2113: result: $ac_cv_prog_gcc_traditional" >&5 + echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" +@@ -2119,7 +2121,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:2122: checking for $ac_word" >&5 ++echo "$as_me:2124: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2134,7 +2136,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:2137: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2139: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2142,10 +2144,10 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:2145: result: $AWK" >&5 ++ echo "$as_me:2147: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:2148: result: no" >&5 ++ echo "$as_me:2150: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2164,7 +2166,7 @@ + # 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 "$as_me:2167: checking for a BSD compatible install" >&5 ++echo "$as_me:2169: checking for a BSD compatible install" >&5 + echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then +@@ -2213,7 +2215,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2216: result: $INSTALL" >&5 ++echo "$as_me:2218: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2224,14 +2226,14 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:2227: checking whether ln -s works" >&5 ++echo "$as_me:2229: checking whether ln -s works" >&5 + echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- echo "$as_me:2231: result: yes" >&5 ++ echo "$as_me:2233: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2234: result: no, using $LN_S" >&5 ++ echo "$as_me:2236: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +@@ -2252,7 +2254,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:2255: checking for $ac_word" >&5 ++echo "$as_me:2257: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LINT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2267,7 +2269,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LINT="$ac_prog" +-echo "$as_me:2270: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2272: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2275,10 +2277,10 @@ + fi + LINT=$ac_cv_prog_LINT + if test -n "$LINT"; then +- echo "$as_me:2278: result: $LINT" >&5 ++ echo "$as_me:2280: result: $LINT" >&5 + echo "${ECHO_T}$LINT" >&6 + else +- echo "$as_me:2281: result: no" >&5 ++ echo "$as_me:2283: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2287,10 +2289,10 @@ + + ### checks for UNIX variants that set C preprocessor variables + +-echo "$as_me:2290: checking for AIX" >&5 ++echo "$as_me:2292: checking for AIX" >&5 + echo $ECHO_N "checking for AIX... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 2293 "configure" ++#line 2295 "configure" + #include "confdefs.h" + #ifdef _AIX + yes +@@ -2299,24 +2301,24 @@ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then +- echo "$as_me:2302: result: yes" >&5 ++ echo "$as_me:2304: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\EOF + #define _ALL_SOURCE 1 + EOF + + else +- echo "$as_me:2309: result: no" >&5 ++ echo "$as_me:2311: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + rm -f conftest* + +-echo "$as_me:2314: checking for POSIXized ISC" >&5 ++echo "$as_me:2316: checking for POSIXized ISC" >&5 + echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 + if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + then +- echo "$as_me:2319: result: yes" >&5 ++ echo "$as_me:2321: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + ISC=yes # If later tests want to check for ISC. + +@@ -2330,14 +2332,14 @@ + CC="$CC -Xp" + fi + else +- echo "$as_me:2333: result: no" >&5 ++ echo "$as_me:2335: result: no" >&5 + echo "${ECHO_T}no" >&6 + ISC= + fi + + ### checks for compiler characteristics + +-echo "$as_me:2340: checking for ${CC-cc} option to accept ANSI C" >&5 ++echo "$as_me:2342: checking for ${CC-cc} option to accept ANSI C" >&5 + echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 + if test "${cf_cv_ansi_cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2431,7 +2433,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 2434 "configure" ++#line 2436 "configure" + #include "confdefs.h" + + #ifndef CC_HAS_PROTOS +@@ -2452,16 +2454,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2455: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2457: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2458: \$? = $ac_status" >&5 ++ echo "$as_me:2460: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2461: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2463: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2464: \$? = $ac_status" >&5 ++ echo "$as_me:2466: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ansi_cc="$cf_arg"; break + else +@@ -2474,7 +2476,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:2477: result: $cf_cv_ansi_cc" >&5 ++echo "$as_me:2479: result: $cf_cv_ansi_cc" >&5 + echo "${ECHO_T}$cf_cv_ansi_cc" >&6 + + if test "$cf_cv_ansi_cc" != "no"; then +@@ -2556,7 +2558,7 @@ + fi + fi + +-echo "$as_me:2559: checking for $CC option to accept ANSI C" >&5 ++echo "$as_me:2561: checking for $CC option to accept ANSI C" >&5 + echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2564,7 +2566,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line 2567 "configure" ++#line 2569 "configure" + #include "confdefs.h" + #include + #include +@@ -2613,16 +2615,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2616: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2618: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2619: \$? = $ac_status" >&5 ++ echo "$as_me:2621: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2622: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2624: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2625: \$? = $ac_status" >&5 ++ echo "$as_me:2627: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -2639,21 +2641,21 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:2642: result: none needed" >&5 ++ echo "$as_me:2644: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:2645: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:2647: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac + +-echo "$as_me:2650: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:2652: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 2656 "configure" ++#line 2658 "configure" + #include "confdefs.h" + + int +@@ -2711,16 +2713,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2714: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2716: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2717: \$? = $ac_status" >&5 ++ echo "$as_me:2719: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2720: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2723: \$? = $ac_status" >&5 ++ echo "$as_me:2725: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +@@ -2730,7 +2732,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:2733: result: $ac_cv_c_const" >&5 ++echo "$as_me:2735: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -2757,7 +2759,7 @@ + #define PROG_EXT "$PROG_EXT" + EOF + +-echo "$as_me:2760: checking if $CC -U and -D options work together" >&5 ++echo "$as_me:2762: checking if $CC -U and -D options work together" >&5 + echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 + if test "${cf_cv_cc_u_d_options+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2766,7 +2768,7 @@ + cf_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" + cat >conftest.$ac_ext <<_ACEOF +-#line 2769 "configure" ++#line 2771 "configure" + #include "confdefs.h" + + int +@@ -2785,16 +2787,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2788: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2790: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2791: \$? = $ac_status" >&5 ++ echo "$as_me:2793: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2794: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2796: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2797: \$? = $ac_status" >&5 ++ echo "$as_me:2799: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_cc_u_d_options=yes +@@ -2808,7 +2810,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:2811: result: $cf_cv_cc_u_d_options" >&5 ++echo "$as_me:2813: result: $cf_cv_cc_u_d_options" >&5 + echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 + + cf_XOPEN_SOURCE=500 +@@ -2834,14 +2836,14 @@ + ;; + linux*|gnu*|k*bsd*-gnu) #(vi + +-echo "$as_me:2837: checking if we must define _GNU_SOURCE" >&5 ++echo "$as_me:2839: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 2844 "configure" ++#line 2846 "configure" + #include "confdefs.h" + #include + int +@@ -2856,16 +2858,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2862: \$? = $ac_status" >&5 ++ echo "$as_me:2864: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2865: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2867: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2868: \$? = $ac_status" >&5 ++ echo "$as_me:2870: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -2874,7 +2876,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 2877 "configure" ++#line 2879 "configure" + #include "confdefs.h" + #include + int +@@ -2889,16 +2891,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2892: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2894: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2895: \$? = $ac_status" >&5 ++ echo "$as_me:2897: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2898: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2900: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2901: \$? = $ac_status" >&5 ++ echo "$as_me:2903: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -2913,7 +2915,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:2916: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:2918: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + +@@ -2940,14 +2942,14 @@ + CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" + ;; + *) +- echo "$as_me:2943: checking if we should define _XOPEN_SOURCE" >&5 ++ echo "$as_me:2945: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 2950 "configure" ++#line 2952 "configure" + #include "confdefs.h" + #include + int +@@ -2962,16 +2964,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2965: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2967: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2968: \$? = $ac_status" >&5 ++ echo "$as_me:2970: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2971: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2973: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2974: \$? = $ac_status" >&5 ++ echo "$as_me:2976: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -2980,7 +2982,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 2983 "configure" ++#line 2985 "configure" + #include "confdefs.h" + #include + int +@@ -2995,16 +2997,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2998: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3000: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3001: \$? = $ac_status" >&5 ++ echo "$as_me:3003: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3004: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3007: \$? = $ac_status" >&5 ++ echo "$as_me:3009: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -3019,7 +3021,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3022: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:3024: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + if test "$cf_cv_xopen_source" != no ; then + +@@ -3053,16 +3055,16 @@ + sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` + +-echo "$as_me:3056: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:3058: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "(line 3062) testing if the symbol is already defined go no further ..." 1>&5 ++echo "(line 3064) testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 3065 "configure" ++#line 3067 "configure" + #include "confdefs.h" + #include + int +@@ -3077,16 +3079,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3080: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3082: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3083: \$? = $ac_status" >&5 ++ echo "$as_me:3085: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3086: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3088: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3089: \$? = $ac_status" >&5 ++ echo "$as_me:3091: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -3107,7 +3109,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 3110 "configure" ++#line 3112 "configure" + #include "confdefs.h" + #include + int +@@ -3122,16 +3124,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3125: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3127: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3128: \$? = $ac_status" >&5 ++ echo "$as_me:3130: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3131: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3133: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3134: \$? = $ac_status" >&5 ++ echo "$as_me:3136: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3142,15 +3144,15 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "(line 3145) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "(line 3147) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + +-echo "(line 3150) testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "(line 3152) testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 3153 "configure" ++#line 3155 "configure" + #include "confdefs.h" + #include + int +@@ -3165,16 +3167,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3168: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3170: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3171: \$? = $ac_status" >&5 ++ echo "$as_me:3173: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3174: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3176: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3177: \$? = $ac_status" >&5 ++ echo "$as_me:3179: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3190,7 +3192,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3193: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:3195: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -3207,14 +3209,14 @@ + ;; + esac + +-echo "$as_me:3210: checking if SIGWINCH is defined" >&5 ++echo "$as_me:3212: checking if SIGWINCH is defined" >&5 + echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 + if test "${cf_cv_define_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 3217 "configure" ++#line 3219 "configure" + #include "confdefs.h" + + #include +@@ -3229,23 +3231,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3232: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3234: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3235: \$? = $ac_status" >&5 ++ echo "$as_me:3237: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3238: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3240: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3241: \$? = $ac_status" >&5 ++ echo "$as_me:3243: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 3248 "configure" ++#line 3250 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -3263,16 +3265,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3266: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3268: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3269: \$? = $ac_status" >&5 ++ echo "$as_me:3271: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3272: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3274: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3275: \$? = $ac_status" >&5 ++ echo "$as_me:3277: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -3286,11 +3288,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3289: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:3291: result: $cf_cv_define_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 + + if test "$cf_cv_define_sigwinch" = maybe ; then +-echo "$as_me:3293: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:3295: checking for actual SIGWINCH definition" >&5 + echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 + if test "${cf_cv_fixup_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3301,7 +3303,7 @@ + while test $cf_sigwinch != 1 + do + cat >conftest.$ac_ext <<_ACEOF +-#line 3304 "configure" ++#line 3306 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -3323,16 +3325,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3326: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3328: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3329: \$? = $ac_status" >&5 ++ echo "$as_me:3331: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3332: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3334: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3335: \$? = $ac_status" >&5 ++ echo "$as_me:3337: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -3346,7 +3348,7 @@ + done + + fi +-echo "$as_me:3349: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:3351: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -3365,23 +3367,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:3368: checking for $ac_header" >&5 ++echo "$as_me:3370: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3374 "configure" ++#line 3376 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:3378: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:3380: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:3384: \$? = $ac_status" >&5 ++ echo "$as_me:3386: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -3400,7 +3402,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:3403: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:3405: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:3415: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3419 "configure" ++#line 3421 "configure" + #include "confdefs.h" + #include + #include +@@ -3432,16 +3434,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3435: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3437: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3438: \$? = $ac_status" >&5 ++ echo "$as_me:3440: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3441: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3443: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3444: \$? = $ac_status" >&5 ++ echo "$as_me:3446: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -3451,7 +3453,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:3454: result: $ac_cv_header_time" >&5 ++echo "$as_me:3456: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -3461,13 +3463,13 @@ + + fi + +- echo "$as_me:3464: checking for nl_langinfo and CODESET" >&5 ++ echo "$as_me:3466: checking for nl_langinfo and CODESET" >&5 + echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 + if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3470 "configure" ++#line 3472 "configure" + #include "confdefs.h" + #include + int +@@ -3479,16 +3481,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3482: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3484: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3485: \$? = $ac_status" >&5 ++ echo "$as_me:3487: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3488: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3490: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3491: \$? = $ac_status" >&5 ++ echo "$as_me:3493: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -3499,7 +3501,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:3502: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:3504: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test $am_cv_langinfo_codeset = yes; then + +@@ -3511,7 +3513,7 @@ + + ### checks for typedefs + +-echo "$as_me:3514: checking for signal global datatype" >&5 ++echo "$as_me:3516: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3523,7 +3525,7 @@ + "int" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 3526 "configure" ++#line 3528 "configure" + #include "confdefs.h" + + #include +@@ -3546,16 +3548,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3549: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3551: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3552: \$? = $ac_status" >&5 ++ echo "$as_me:3554: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3555: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3557: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3558: \$? = $ac_status" >&5 ++ echo "$as_me:3560: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -3569,20 +3571,20 @@ + + fi + +-echo "$as_me:3572: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:3574: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h < or " >&5 ++echo "$as_me:3580: checking for size_t in or " >&5 + echo $ECHO_N "checking for size_t in or ... $ECHO_C" >&6 + if test "${cf_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 3585 "configure" ++#line 3587 "configure" + #include "confdefs.h" + + #include +@@ -3600,16 +3602,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3603: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3605: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3606: \$? = $ac_status" >&5 ++ echo "$as_me:3608: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3609: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3611: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3612: \$? = $ac_status" >&5 ++ echo "$as_me:3614: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_size_t=yes + else +@@ -3621,19 +3623,19 @@ + + fi + +-echo "$as_me:3624: result: $cf_cv_type_size_t" >&5 ++echo "$as_me:3626: result: $cf_cv_type_size_t" >&5 + echo "${ECHO_T}$cf_cv_type_size_t" >&6 + test $cf_cv_type_size_t = no && cat >>confdefs.h <<\EOF + #define size_t unsigned + EOF + +-echo "$as_me:3630: checking for ANSI C header files" >&5 ++echo "$as_me:3632: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3636 "configure" ++#line 3638 "configure" + #include "confdefs.h" + #include + #include +@@ -3641,13 +3643,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:3644: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:3646: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:3650: \$? = $ac_status" >&5 ++ echo "$as_me:3652: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -3669,7 +3671,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 <<_ACEOF +-#line 3672 "configure" ++#line 3674 "configure" + #include "confdefs.h" + #include + +@@ -3687,7 +3689,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 <<_ACEOF +-#line 3690 "configure" ++#line 3692 "configure" + #include "confdefs.h" + #include + +@@ -3708,7 +3710,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3711 "configure" ++#line 3713 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -3734,15 +3736,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:3737: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3739: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3740: \$? = $ac_status" >&5 ++ echo "$as_me:3742: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:3742: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3745: \$? = $ac_status" >&5 ++ echo "$as_me:3747: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3755,7 +3757,7 @@ + fi + fi + fi +-echo "$as_me:3758: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:3760: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -3771,28 +3773,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:3774: checking for $ac_header" >&5 ++echo "$as_me:3776: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3780 "configure" ++#line 3782 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3786: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3788: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3789: \$? = $ac_status" >&5 ++ echo "$as_me:3791: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3792: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3794: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3795: \$? = $ac_status" >&5 ++ echo "$as_me:3797: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -3802,7 +3804,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:3805: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:3807: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:3817: checking for time_t" >&5 + echo $ECHO_N "checking for time_t... $ECHO_C" >&6 + if test "${ac_cv_type_time_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3821 "configure" ++#line 3823 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -3833,16 +3835,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3836: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3838: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3839: \$? = $ac_status" >&5 ++ echo "$as_me:3841: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3842: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3844: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3845: \$? = $ac_status" >&5 ++ echo "$as_me:3847: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_time_t=yes + else +@@ -3852,7 +3854,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:3855: result: $ac_cv_type_time_t" >&5 ++echo "$as_me:3857: result: $ac_cv_type_time_t" >&5 + echo "${ECHO_T}$ac_cv_type_time_t" >&6 + if test $ac_cv_type_time_t = yes; then + : +@@ -3864,13 +3866,13 @@ + + fi + +-echo "$as_me:3867: checking for mode_t" >&5 ++echo "$as_me:3869: checking for mode_t" >&5 + echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 + if test "${ac_cv_type_mode_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3873 "configure" ++#line 3875 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -3885,16 +3887,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3888: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3890: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3891: \$? = $ac_status" >&5 ++ echo "$as_me:3893: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3894: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3897: \$? = $ac_status" >&5 ++ echo "$as_me:3899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_mode_t=yes + else +@@ -3904,7 +3906,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:3907: result: $ac_cv_type_mode_t" >&5 ++echo "$as_me:3909: result: $ac_cv_type_mode_t" >&5 + echo "${ECHO_T}$ac_cv_type_mode_t" >&6 + if test $ac_cv_type_mode_t = yes; then + : +@@ -3916,13 +3918,13 @@ + + fi + +-echo "$as_me:3919: checking for pid_t" >&5 ++echo "$as_me:3921: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3925 "configure" ++#line 3927 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -3937,16 +3939,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3940: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3942: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3943: \$? = $ac_status" >&5 ++ echo "$as_me:3945: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3946: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3948: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3949: \$? = $ac_status" >&5 ++ echo "$as_me:3951: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_pid_t=yes + else +@@ -3956,7 +3958,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:3959: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:3961: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test $ac_cv_type_pid_t = yes; then + : +@@ -3968,13 +3970,13 @@ + + fi + +-echo "$as_me:3971: checking for uid_t in sys/types.h" >&5 ++echo "$as_me:3973: checking for uid_t in sys/types.h" >&5 + echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 + if test "${ac_cv_type_uid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3977 "configure" ++#line 3979 "configure" + #include "confdefs.h" + #include + +@@ -3988,7 +3990,7 @@ + rm -f conftest* + + fi +-echo "$as_me:3991: result: $ac_cv_type_uid_t" >&5 ++echo "$as_me:3993: result: $ac_cv_type_uid_t" >&5 + echo "${ECHO_T}$ac_cv_type_uid_t" >&6 + if test $ac_cv_type_uid_t = no; then + +@@ -4002,13 +4004,13 @@ + + fi + +-echo "$as_me:4005: checking for off_t" >&5 ++echo "$as_me:4007: checking for off_t" >&5 + echo $ECHO_N "checking for off_t... $ECHO_C" >&6 + if test "${ac_cv_type_off_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4011 "configure" ++#line 4013 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -4023,16 +4025,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4026: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4028: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4029: \$? = $ac_status" >&5 ++ echo "$as_me:4031: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4032: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4034: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4035: \$? = $ac_status" >&5 ++ echo "$as_me:4037: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_off_t=yes + else +@@ -4042,7 +4044,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:4045: result: $ac_cv_type_off_t" >&5 ++echo "$as_me:4047: result: $ac_cv_type_off_t" >&5 + echo "${ECHO_T}$ac_cv_type_off_t" >&6 + if test $ac_cv_type_off_t = yes; then + : +@@ -4071,13 +4073,13 @@ + wcwidth + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:4074: checking for $ac_func" >&5 ++echo "$as_me:4076: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4080 "configure" ++#line 4082 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -4108,16 +4110,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4111: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4113: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4114: \$? = $ac_status" >&5 ++ echo "$as_me:4116: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4117: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4119: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4120: \$? = $ac_status" >&5 ++ echo "$as_me:4122: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -4127,7 +4129,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:4130: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:4132: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:4142: checking for memmove" >&5 + echo $ECHO_N "checking for memmove... $ECHO_C" >&6 + if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4146 "configure" ++#line 4148 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char memmove (); below. */ +@@ -4174,16 +4176,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4177: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4179: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4180: \$? = $ac_status" >&5 ++ echo "$as_me:4182: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4183: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4185: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4186: \$? = $ac_status" >&5 ++ echo "$as_me:4188: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_memmove=yes + else +@@ -4193,19 +4195,19 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:4196: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:4198: result: $ac_cv_func_memmove" >&5 + echo "${ECHO_T}$ac_cv_func_memmove" >&6 + if test $ac_cv_func_memmove = yes; then + : + else + +-echo "$as_me:4202: checking for bcopy" >&5 ++echo "$as_me:4204: checking for bcopy" >&5 + echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 + if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4208 "configure" ++#line 4210 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char bcopy (); below. */ +@@ -4236,16 +4238,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4239: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4241: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4242: \$? = $ac_status" >&5 ++ echo "$as_me:4244: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4245: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4247: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4248: \$? = $ac_status" >&5 ++ echo "$as_me:4250: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_bcopy=yes + else +@@ -4255,11 +4257,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:4258: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:4260: result: $ac_cv_func_bcopy" >&5 + echo "${ECHO_T}$ac_cv_func_bcopy" >&6 + if test $ac_cv_func_bcopy = yes; then + +- echo "$as_me:4262: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:4264: checking if bcopy does overlapping moves" >&5 + echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 + if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4269,7 +4271,7 @@ + cf_cv_good_bcopy=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4272 "configure" ++#line 4274 "configure" + #include "confdefs.h" + + int main() { +@@ -4283,15 +4285,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:4286: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4288: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4289: \$? = $ac_status" >&5 ++ echo "$as_me:4291: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:4291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4293: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4294: \$? = $ac_status" >&5 ++ echo "$as_me:4296: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_good_bcopy=yes + else +@@ -4304,7 +4306,7 @@ + fi + + fi +-echo "$as_me:4307: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:4309: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -4328,23 +4330,23 @@ + for ac_header in lastlog.h paths.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:4331: checking for $ac_header" >&5 ++echo "$as_me:4333: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4337 "configure" ++#line 4339 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:4341: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:4343: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4347: \$? = $ac_status" >&5 ++ echo "$as_me:4349: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4363,7 +4365,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4366: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:4368: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:4378: checking for lastlog path" >&5 + echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6 + if test "${cf_cv_path_lastlog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 4383 "configure" ++#line 4385 "configure" + #include "confdefs.h" + + #include +@@ -4400,16 +4402,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4403: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4405: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4406: \$? = $ac_status" >&5 ++ echo "$as_me:4408: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4409: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4411: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4412: \$? = $ac_status" >&5 ++ echo "$as_me:4414: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_path_lastlog="_PATH_LASTLOG" + else +@@ -4424,13 +4426,13 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:4427: result: $cf_cv_path_lastlog" >&5 ++echo "$as_me:4429: result: $cf_cv_path_lastlog" >&5 + echo "${ECHO_T}$cf_cv_path_lastlog" >&6 + test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF + #define USE_LASTLOG 1 + EOF + +-echo "$as_me:4433: checking for utmp implementation" >&5 ++echo "$as_me:4435: checking for utmp implementation" >&5 + echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6 + if test "${cf_cv_have_utmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4447,7 +4449,7 @@ + #endif + " + cat >conftest.$ac_ext <<_ACEOF +-#line 4450 "configure" ++#line 4452 "configure" + #include "confdefs.h" + $cf_utmp_includes + int +@@ -4461,16 +4463,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4464: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4466: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4467: \$? = $ac_status" >&5 ++ echo "$as_me:4469: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4470: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4472: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4473: \$? = $ac_status" >&5 ++ echo "$as_me:4475: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp=$cf_header + break +@@ -4479,7 +4481,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 4482 "configure" ++#line 4484 "configure" + #include "confdefs.h" + $cf_utmp_includes + int +@@ -4493,16 +4495,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4496: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4498: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4499: \$? = $ac_status" >&5 ++ echo "$as_me:4501: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4502: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4504: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4505: \$? = $ac_status" >&5 ++ echo "$as_me:4507: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp=$cf_header + break +@@ -4517,7 +4519,7 @@ + done + + fi +-echo "$as_me:4520: result: $cf_cv_have_utmp" >&5 ++echo "$as_me:4522: result: $cf_cv_have_utmp" >&5 + echo "${ECHO_T}$cf_cv_have_utmp" >&6 + + if test $cf_cv_have_utmp != no ; then +@@ -4530,14 +4532,14 @@ + EOF + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:4533: checking if utmp.ut_host is declared" >&5 +-echo $ECHO_N "checking if utmp.ut_host is declared... $ECHO_C" >&6 ++echo "$as_me:4535: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5 ++echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6 + if test "${cf_cv_have_utmp_ut_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 4540 "configure" ++#line 4542 "configure" + #include "confdefs.h" + + #include +@@ -4551,16 +4553,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4554: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4556: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4557: \$? = $ac_status" >&5 ++ echo "$as_me:4559: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4560: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4562: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4563: \$? = $ac_status" >&5 ++ echo "$as_me:4565: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_host=yes + else +@@ -4572,7 +4574,7 @@ + + fi + +-echo "$as_me:4575: result: $cf_cv_have_utmp_ut_host" >&5 ++echo "$as_me:4577: result: $cf_cv_have_utmp_ut_host" >&5 + echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6 + test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF + #define HAVE_UTMP_UT_HOST 1 +@@ -4581,8 +4583,8 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:4584: checking if utmp.ut_name is declared" >&5 +-echo $ECHO_N "checking if utmp.ut_name is declared... $ECHO_C" >&6 ++echo "$as_me:4586: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5 ++echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6 + if test "${cf_cv_have_utmp_ut_name+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4598,7 +4600,7 @@ + " + for cf_header in ut_name ut_user ; do + cat >conftest.$ac_ext <<_ACEOF +-#line 4601 "configure" ++#line 4603 "configure" + #include "confdefs.h" + $cf_utmp_includes + int +@@ -4612,16 +4614,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4615: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4617: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4618: \$? = $ac_status" >&5 ++ echo "$as_me:4620: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4621: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4623: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4624: \$? = $ac_status" >&5 ++ echo "$as_me:4626: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_name=$cf_header + break +@@ -4633,12 +4635,12 @@ + done + + fi +-echo "$as_me:4636: result: $cf_cv_have_utmp_ut_name" >&5 ++echo "$as_me:4638: result: $cf_cv_have_utmp_ut_name" >&5 + echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6 + + case $cf_cv_have_utmp_ut_name in #(vi + no) #(vi +- { { echo "$as_me:4641: error: Cannot find declaration for ut.ut_name" >&5 ++ { { echo "$as_me:4643: error: Cannot find declaration for ut.ut_name" >&5 + echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4652,7 +4654,7 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:4655: checking for exit-status in $cf_cv_have_utmp" >&5 ++echo "$as_me:4657: checking for exit-status in $cf_cv_have_utmp" >&5 + echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6 + if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4665,7 +4667,7 @@ + ut_exit.ut_exit + do + cat >conftest.$ac_ext <<_ACEOF +-#line 4668 "configure" ++#line 4670 "configure" + #include "confdefs.h" + + #include +@@ -4679,16 +4681,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4682: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4684: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4685: \$? = $ac_status" >&5 ++ echo "$as_me:4687: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4688: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4690: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4691: \$? = $ac_status" >&5 ++ echo "$as_me:4693: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xstatus=$cf_result + break +@@ -4701,7 +4703,7 @@ + done + + fi +-echo "$as_me:4704: result: $cf_cv_have_utmp_ut_xstatus" >&5 ++echo "$as_me:4706: result: $cf_cv_have_utmp_ut_xstatus" >&5 + echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6 + if test $cf_cv_have_utmp_ut_xstatus != no ; then + cat >>confdefs.h <<\EOF +@@ -4716,14 +4718,14 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:4719: checking if utmp.ut_xtime is declared" >&5 +-echo $ECHO_N "checking if utmp.ut_xtime is declared... $ECHO_C" >&6 ++echo "$as_me:4721: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5 ++echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6 + if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 4726 "configure" ++#line 4728 "configure" + #include "confdefs.h" + + #include +@@ -4737,23 +4739,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4740: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4742: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4743: \$? = $ac_status" >&5 ++ echo "$as_me:4745: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4746: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4748: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4749: \$? = $ac_status" >&5 ++ echo "$as_me:4751: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xtime=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 4756 "configure" ++#line 4758 "configure" + #include "confdefs.h" + + #include +@@ -4767,16 +4769,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4770: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4772: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4773: \$? = $ac_status" >&5 ++ echo "$as_me:4775: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4776: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4778: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4779: \$? = $ac_status" >&5 ++ echo "$as_me:4781: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xtime=define + else +@@ -4790,7 +4792,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:4793: result: $cf_cv_have_utmp_ut_xtime" >&5 ++echo "$as_me:4795: result: $cf_cv_have_utmp_ut_xtime" >&5 + echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6 + if test $cf_cv_have_utmp_ut_xtime != no ; then + cat >>confdefs.h <<\EOF +@@ -4807,14 +4809,14 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:4810: checking if utmp.ut_session is declared" >&5 +-echo $ECHO_N "checking if utmp.ut_session is declared... $ECHO_C" >&6 ++echo "$as_me:4812: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5 ++echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6 + if test "${cf_cv_have_utmp_ut_session+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 4817 "configure" ++#line 4819 "configure" + #include "confdefs.h" + + #include +@@ -4828,16 +4830,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4833: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4834: \$? = $ac_status" >&5 ++ echo "$as_me:4836: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4837: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4839: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4840: \$? = $ac_status" >&5 ++ echo "$as_me:4842: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_session=yes + else +@@ -4848,7 +4850,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:4851: result: $cf_cv_have_utmp_ut_session" >&5 ++echo "$as_me:4853: result: $cf_cv_have_utmp_ut_session" >&5 + echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6 + if test $cf_cv_have_utmp_ut_session != no ; then + cat >>confdefs.h <<\EOF +@@ -4858,7 +4860,7 @@ + fi + fi + +-echo "$as_me:4861: checking if $cf_cv_have_utmp is SYSV flavor" >&5 ++echo "$as_me:4863: checking if $cf_cv_have_utmp is SYSV flavor" >&5 + echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6 + if test "${cf_cv_sysv_utmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4866,7 +4868,7 @@ + + test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" + cat >conftest.$ac_ext <<_ACEOF +-#line 4869 "configure" ++#line 4871 "configure" + #include "confdefs.h" + + #include +@@ -4885,16 +4887,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4888: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4890: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4891: \$? = $ac_status" >&5 ++ echo "$as_me:4893: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4894: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4897: \$? = $ac_status" >&5 ++ echo "$as_me:4899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sysv_utmp=yes + else +@@ -4905,7 +4907,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:4908: result: $cf_cv_sysv_utmp" >&5 ++echo "$as_me:4910: result: $cf_cv_sysv_utmp" >&5 + echo "${ECHO_T}$cf_cv_sysv_utmp" >&6 + test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF + #define USE_SYSV_UTMP 1 +@@ -4916,23 +4918,23 @@ + for ac_header in lastlog.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:4919: checking for $ac_header" >&5 ++echo "$as_me:4921: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4925 "configure" ++#line 4927 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:4929: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:4931: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4935: \$? = $ac_status" >&5 ++ echo "$as_me:4937: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4951,7 +4953,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4954: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:4956: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:4966: checking for struct lastlog" >&5 + echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6 + if test "${cf_cv_struct_lastlog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4972,7 +4974,7 @@ + cf_cv_struct_lastlog=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4975 "configure" ++#line 4977 "configure" + #include "confdefs.h" + + #include +@@ -4986,15 +4988,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:4989: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4991: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4992: \$? = $ac_status" >&5 ++ echo "$as_me:4994: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:4994: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4996: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4997: \$? = $ac_status" >&5 ++ echo "$as_me:4999: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_struct_lastlog=yes +@@ -5008,7 +5010,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:5011: result: $cf_cv_struct_lastlog" >&5 ++echo "$as_me:5013: result: $cf_cv_struct_lastlog" >&5 + echo "${ECHO_T}$cf_cv_struct_lastlog" >&6 + + test $cf_cv_struct_lastlog != no && cat >>confdefs.h <<\EOF +@@ -5020,23 +5022,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5023: checking for $ac_header" >&5 ++echo "$as_me:5025: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5029 "configure" ++#line 5031 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5033: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:5035: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:5039: \$? = $ac_status" >&5 ++ echo "$as_me:5041: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5055,7 +5057,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:5058: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:5060: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:5070: checking if POSIX saved-ids are supported" >&5 + echo $ECHO_N "checking if POSIX saved-ids are supported... $ECHO_C" >&6 + if test "${cf_cv_posix_saved_ids+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 5075 "configure" ++#line 5077 "configure" + #include "confdefs.h" + + #include +@@ -5100,16 +5102,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5103: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5105: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5106: \$? = $ac_status" >&5 ++ echo "$as_me:5108: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5109: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5111: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5112: \$? = $ac_status" >&5 ++ echo "$as_me:5114: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_saved_ids=yes + +@@ -5121,7 +5123,7 @@ + cf_cv_posix_saved_ids=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5124 "configure" ++#line 5126 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -5132,19 +5134,19 @@ + { + void *p = (void *) seteuid; + long code = sysconf(_SC_SAVED_IDS); +- exit ((code > 0) ? 0 : 1); ++ ${cf_cv_main_return:-return} ((code > 0) ? 0 : 1); + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:5139: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5141: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5142: \$? = $ac_status" >&5 ++ echo "$as_me:5144: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:5144: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5146: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5147: \$? = $ac_status" >&5 ++ echo "$as_me:5149: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_saved_ids=yes + else +@@ -5160,7 +5162,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:5163: result: $cf_cv_posix_saved_ids" >&5 ++echo "$as_me:5165: result: $cf_cv_posix_saved_ids" >&5 + echo "${ECHO_T}$cf_cv_posix_saved_ids" >&6 + + test "$cf_cv_posix_saved_ids" = yes && cat >>confdefs.h <<\EOF +@@ -5175,7 +5177,7 @@ + test -n "$TERMCAP" && cf_TERMVAR="$TERM" + test -z "$cf_TERMVAR" && cf_TERMVAR=vt100 + +-echo "$as_me:5178: checking if we want full tgetent function" >&5 ++echo "$as_me:5180: checking if we want full tgetent function" >&5 + echo $ECHO_N "checking if we want full tgetent function... $ECHO_C" >&6 + + # Check whether --enable-full-tgetent or --disable-full-tgetent was given. +@@ -5192,7 +5194,7 @@ + cf_full_tgetent=yes + + fi; +-echo "$as_me:5195: result: $cf_full_tgetent" >&5 ++echo "$as_me:5197: result: $cf_full_tgetent" >&5 + echo "${ECHO_T}$cf_full_tgetent" >&6 + + if test "$cf_full_tgetent" = yes ; then +@@ -5201,7 +5203,7 @@ + cf_test_message="tgetent" + fi + +-echo "$as_me:5204: checking for $cf_test_message function" >&5 ++echo "$as_me:5206: checking for $cf_test_message function" >&5 + echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6 + if test "${cf_cv_lib_tgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5223,7 +5225,7 @@ + echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5226 "configure" ++#line 5228 "configure" + #include "confdefs.h" + + /* terminfo implementations ignore the buffer argument, making it useless for +@@ -5235,18 +5237,18 @@ + char buffer[1024]; + buffer[0] = 0; + tgetent(buffer, "$cf_TERMVAR"); +- exit($cf_TERMTST); } ++ ${cf_cv_main_return:-return} ($cf_TERMTST); } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:5241: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5243: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5244: \$? = $ac_status" >&5 ++ echo "$as_me:5246: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:5246: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5248: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5249: \$? = $ac_status" >&5 ++ echo "$as_me:5251: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5 + if test -n "$cf_termlib" ; then +@@ -5267,7 +5269,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:5270: result: $cf_cv_lib_tgetent" >&5 ++echo "$as_me:5272: result: $cf_cv_lib_tgetent" >&5 + echo "${ECHO_T}$cf_cv_lib_tgetent" >&6 + + # If we found a working tgetent(), set LIBS and check for termcap.h. +@@ -5281,7 +5283,7 @@ + EOF + + cat >conftest.$ac_ext <<_ACEOF +-#line 5284 "configure" ++#line 5286 "configure" + #include "confdefs.h" + + #include +@@ -5297,16 +5299,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5300: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5302: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5303: \$? = $ac_status" >&5 ++ echo "$as_me:5305: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5306: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5308: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5309: \$? = $ac_status" >&5 ++ echo "$as_me:5311: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\EOF + #define HAVE_TERMCAP_H 1 +@@ -5323,7 +5325,7 @@ + # a crippled one. A crippled tgetent() is still useful to + # validate values for the TERM environment variable given to + # child processes. +- echo "$as_me:5326: checking for partial tgetent function" >&5 ++ echo "$as_me:5328: checking for partial tgetent function" >&5 + echo $ECHO_N "checking for partial tgetent function... $ECHO_C" >&6 + if test "${cf_cv_lib_part_tgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5333,7 +5335,7 @@ + for cf_termlib in $cf_TERMLIB ; do + LIBS="$cf_save_LIBS -l$cf_termlib" + cat >conftest.$ac_ext <<_ACEOF +-#line 5336 "configure" ++#line 5338 "configure" + #include "confdefs.h" + + int +@@ -5345,16 +5347,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5348: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5350: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5351: \$? = $ac_status" >&5 ++ echo "$as_me:5353: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5354: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5356: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5357: \$? = $ac_status" >&5 ++ echo "$as_me:5359: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "there is a terminfo/tgetent in $cf_termlib" 1>&5 + cf_cv_lib_part_tgetent="-l$cf_termlib" +@@ -5368,7 +5370,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:5371: result: $cf_cv_lib_part_tgetent" >&5 ++echo "$as_me:5373: result: $cf_cv_lib_part_tgetent" >&5 + echo "${ECHO_T}$cf_cv_lib_part_tgetent" >&6 + + if test "$cf_cv_lib_part_tgetent" != no ; then +@@ -5377,23 +5379,23 @@ + for ac_header in termcap.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5380: checking for $ac_header" >&5 ++echo "$as_me:5382: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5386 "configure" ++#line 5388 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5390: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:5392: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:5396: \$? = $ac_status" >&5 ++ echo "$as_me:5398: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5412,7 +5414,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:5415: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:5417: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:5436: checking for directory to install resource files" >&5 + echo $ECHO_N "checking for directory to install resource files... $ECHO_C" >&6 + + # Check whether --with-app-defaults or --without-app-defaults was given. +@@ -5466,7 +5468,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:5469: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:5471: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -5474,7 +5476,7 @@ + + appsdir="$withval" + +-echo "$as_me:5477: result: $appsdir" >&5 ++echo "$as_me:5479: result: $appsdir" >&5 + echo "${ECHO_T}$appsdir" >&6 + + no_appsdir= +@@ -5482,7 +5484,7 @@ + + # inherit SINSTALL_OPTS from environment to allow packager to customize it. + +-echo "$as_me:5485: checking for install-permissions reference" >&5 ++echo "$as_me:5487: checking for install-permissions reference" >&5 + echo $ECHO_N "checking for install-permissions reference... $ECHO_C" >&6 + + # Check whether --with-reference or --without-reference was given. +@@ -5492,7 +5494,7 @@ + else + with_reference=xterm + fi; +-echo "$as_me:5495: result: $with_reference" >&5 ++echo "$as_me:5497: result: $with_reference" >&5 + echo "${ECHO_T}$with_reference" >&6 + + with_full_paths=yes +@@ -5502,7 +5504,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5505: checking for $ac_word" >&5 ++echo "$as_me:5507: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_XTERM_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5519,7 +5521,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_XTERM_PATH="$ac_dir/$ac_word" +- echo "$as_me:5522: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:5524: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -5530,10 +5532,10 @@ + XTERM_PATH=$ac_cv_path_XTERM_PATH + + if test -n "$XTERM_PATH"; then +- echo "$as_me:5533: result: $XTERM_PATH" >&5 ++ echo "$as_me:5535: result: $XTERM_PATH" >&5 + echo "${ECHO_T}$XTERM_PATH" >&6 + else +- echo "$as_me:5536: result: no" >&5 ++ echo "$as_me:5538: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5601,7 +5603,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "(line 5604) testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "(line 5606) testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:5626: checking for symbolic link to create to $cf_name" >&5 + echo $ECHO_N "checking for symbolic link to create to $cf_name... $ECHO_C" >&6 + + # Check whether --with-xterm-symlink or --without-xterm-symlink was given. +@@ -5631,7 +5633,7 @@ + else + with_symlink=xterm + fi; +-echo "$as_me:5634: result: $with_symlink" >&5 ++echo "$as_me:5636: result: $with_symlink" >&5 + echo "${ECHO_T}$with_symlink" >&6 + test "$with_symlink" = yes && with_symlink=xterm + test -n "$with_symlink" && \ +@@ -5640,7 +5642,7 @@ + XTERM_SYMLINK="$with_symlink" + fi + +-echo "$as_me:5643: checking if you want to disable setuid" >&5 ++echo "$as_me:5645: checking if you want to disable setuid" >&5 + echo $ECHO_N "checking if you want to disable setuid... $ECHO_C" >&6 + + # Check whether --enable-setuid or --disable-setuid was given. +@@ -5657,10 +5659,30 @@ + disable_setuid=no + + fi; +-echo "$as_me:5660: result: $disable_setuid" >&5 ++echo "$as_me:5662: result: $disable_setuid" >&5 + echo "${ECHO_T}$disable_setuid" >&6 + +-echo "$as_me:5663: checking if you want to run xterm setuid to a given user" >&5 ++echo "$as_me:5665: checking if you want to disable setgid" >&5 ++echo $ECHO_N "checking if you want to disable setgid... $ECHO_C" >&6 ++ ++# Check whether --enable-setgid or --disable-setgid was given. ++if test "${enable_setgid+set}" = set; then ++ enableval="$enable_setgid" ++ test "$enableval" != no && enableval=yes ++ if test "$enableval" != "yes" ; then ++ disable_setgid=yes ++ else ++ disable_setgid=no ++ fi ++else ++ enableval=yes ++ disable_setgid=no ++ ++fi; ++echo "$as_me:5682: result: $disable_setuid" >&5 ++echo "${ECHO_T}$disable_setuid" >&6 ++ ++echo "$as_me:5685: checking if you want to run xterm setuid to a given user" >&5 + echo $ECHO_N "checking if you want to run xterm setuid to a given user... $ECHO_C" >&6 + + # Check whether --with-setuid or --without-setuid was given. +@@ -5670,7 +5692,7 @@ + else + use_given_setuid=no + fi; +-echo "$as_me:5673: result: $use_given_setuid" >&5 ++echo "$as_me:5695: result: $use_given_setuid" >&5 + echo "${ECHO_T}$use_given_setuid" >&6 + + if test "$use_given_setuid" != no ; then +@@ -5682,7 +5704,7 @@ + SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid" + fi + +-echo "$as_me:5685: checking if you want to run xterm setgid to match utmp/utmpx file" >&5 ++echo "$as_me:5707: checking if you want to run xterm setgid to match utmp/utmpx file" >&5 + echo $ECHO_N "checking if you want to run xterm setgid to match utmp/utmpx file... $ECHO_C" >&6 + + # Check whether --with-utmp-setgid or --without-utmp-setgid was given. +@@ -5692,14 +5714,14 @@ + else + use_utmp_setgid=no + fi; +-echo "$as_me:5695: result: $use_utmp_setgid" >&5 ++echo "$as_me:5717: result: $use_utmp_setgid" >&5 + echo "${ECHO_T}$use_utmp_setgid" >&6 + + if test "$use_utmp_setgid" != no ; then + if test "$use_utmp_setgid" = yes ; then + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:5702: checking for utmp/utmpx group" >&5 ++echo "$as_me:5724: checking for utmp/utmpx group" >&5 + echo $ECHO_N "checking for utmp/utmpx group... $ECHO_C" >&6 + if test "${cf_cv_utmp_group+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5741,10 +5763,10 @@ + done + + fi +-echo "$as_me:5744: result: $cf_cv_utmp_group" >&5 ++echo "$as_me:5766: result: $cf_cv_utmp_group" >&5 + echo "${ECHO_T}$cf_cv_utmp_group" >&6 + else +- { { echo "$as_me:5747: error: cannot find utmp group" >&5 ++ { { echo "$as_me:5769: error: cannot find utmp group" >&5 + echo "$as_me: error: cannot find utmp group" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5753,7 +5775,7 @@ + cf_cv_utmp_group=$use_utmp_setgid + fi + if test "$cf_cv_posix_saved_ids" != yes ; then +- { { echo "$as_me:5756: error: Your system does not support POSIX saved-ids" >&5 ++ { { echo "$as_me:5778: error: Your system does not support POSIX saved-ids" >&5 + echo "$as_me: error: Your system does not support POSIX saved-ids" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5764,7 +5786,7 @@ + SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group" + fi + +-echo "$as_me:5767: checking if you want to link with utempter" >&5 ++echo "$as_me:5789: checking if you want to link with utempter" >&5 + echo $ECHO_N "checking if you want to link with utempter... $ECHO_C" >&6 + + # Check whether --with-utempter or --without-utempter was given. +@@ -5774,12 +5796,12 @@ + else + use_utempter=no + fi; +-echo "$as_me:5777: result: $use_utempter" >&5 ++echo "$as_me:5799: result: $use_utempter" >&5 + echo "${ECHO_T}$use_utempter" >&6 + + if test "$use_utempter" = yes ; then + +-echo "$as_me:5782: checking if we can link with utempter library" >&5 ++echo "$as_me:5804: checking if we can link with utempter library" >&5 + echo $ECHO_N "checking if we can link with utempter library... $ECHO_C" >&6 + if test "${cf_cv_have_utempter+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5788,7 +5810,7 @@ + cf_save_LIBS="$LIBS" + LIBS="-lutempter $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5791 "configure" ++#line 5813 "configure" + #include "confdefs.h" + + #include +@@ -5805,16 +5827,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5808: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5830: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5811: \$? = $ac_status" >&5 ++ echo "$as_me:5833: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5814: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5817: \$? = $ac_status" >&5 ++ echo "$as_me:5839: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_have_utempter=yes +@@ -5828,7 +5850,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:5831: result: $cf_cv_have_utempter" >&5 ++echo "$as_me:5853: result: $cf_cv_have_utempter" >&5 + echo "${ECHO_T}$cf_cv_have_utempter" >&6 + if test "$cf_cv_have_utempter" = yes ; then + cat >>confdefs.h <<\EOF +@@ -5843,14 +5865,14 @@ + + ### checks for external data + +-echo "$as_me:5846: checking if external errno is declared" >&5 ++echo "$as_me:5868: checking if external errno is declared" >&5 + echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 5853 "configure" ++#line 5875 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -5868,16 +5890,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5871: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5874: \$? = $ac_status" >&5 ++ echo "$as_me:5896: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5877: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5899: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5880: \$? = $ac_status" >&5 ++ echo "$as_me:5902: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_errno=yes + else +@@ -5888,7 +5910,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:5891: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:5913: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -5903,14 +5925,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:5906: checking if external errno exists" >&5 ++echo "$as_me:5928: checking if external errno exists" >&5 + echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 + if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 5913 "configure" ++#line 5935 "configure" + #include "confdefs.h" + + #undef errno +@@ -5925,16 +5947,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5928: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5950: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5931: \$? = $ac_status" >&5 ++ echo "$as_me:5953: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5934: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5956: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5937: \$? = $ac_status" >&5 ++ echo "$as_me:5959: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_errno=yes + else +@@ -5945,7 +5967,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:5948: result: $cf_cv_have_errno" >&5 ++echo "$as_me:5970: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -5958,7 +5980,7 @@ + + fi + +-echo "$as_me:5961: checking for explicit tty group name" >&5 ++echo "$as_me:5983: checking for explicit tty group name" >&5 + echo $ECHO_N "checking for explicit tty group name... $ECHO_C" >&6 + + # Check whether --with-tty-group or --without-tty-group was given. +@@ -5970,11 +5992,11 @@ + fi; + test -z "$cf_tty_group" && cf_tty_group=auto... + test "$cf_tty_group" = yes && cf_tty_group=auto... +-echo "$as_me:5973: result: $cf_tty_group" >&5 ++echo "$as_me:5995: result: $cf_tty_group" >&5 + echo "${ECHO_T}$cf_tty_group" >&6 + + if test "$cf_tty_group" = "auto..." ; then +-echo "$as_me:5977: checking for tty group name" >&5 ++echo "$as_me:5999: checking for tty group name" >&5 + echo $ECHO_N "checking for tty group name... $ECHO_C" >&6 + if test "${cf_cv_tty_group_name+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6027,7 +6049,7 @@ + fi + + fi +-echo "$as_me:6030: result: $cf_cv_tty_group_name" >&5 ++echo "$as_me:6052: result: $cf_cv_tty_group_name" >&5 + echo "${ECHO_T}$cf_cv_tty_group_name" >&6 + cf_tty_group="$cf_cv_tty_group_name" + else +@@ -6046,7 +6068,7 @@ + # does apply to the device. We cannot perform this test if we are in batch + # mode, or if we are cross-compiling. + +-echo "$as_me:6049: checking if we may use the $cf_tty_group group" >&5 ++echo "$as_me:6071: checking if we may use the $cf_tty_group group" >&5 + echo $ECHO_N "checking if we may use the $cf_tty_group group... $ECHO_C" >&6 + if test "${cf_cv_tty_group+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6059,7 +6081,7 @@ + cf_cv_tty_group=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6062 "configure" ++#line 6084 "configure" + #include "confdefs.h" + + #include +@@ -6078,22 +6100,22 @@ + && stat(name, &sb) == 0 + && sb.st_gid != getgid() + && sb.st_gid == ttygrp->gr_gid) { +- exit(0); ++ ${cf_cv_main_return:-return} (0); + } +- exit(1); ++ ${cf_cv_main_return:-return} (1); + } + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:6088: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6110: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6091: \$? = $ac_status" >&5 ++ echo "$as_me:6113: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6093: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6096: \$? = $ac_status" >&5 ++ echo "$as_me:6118: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_tty_group=yes + else +@@ -6111,11 +6133,11 @@ + fi + + fi +-echo "$as_me:6114: result: $cf_cv_tty_group" >&5 ++echo "$as_me:6136: result: $cf_cv_tty_group" >&5 + echo "${ECHO_T}$cf_cv_tty_group" >&6 + + if test $cf_cv_tty_group = no ; then +- { echo "$as_me:6118: WARNING: Cannot use $cf_tty_group group" >&5 ++ { echo "$as_me:6140: WARNING: Cannot use $cf_tty_group group" >&5 + echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;} + else + cat >>confdefs.h <<\EOF +@@ -6126,13 +6148,13 @@ + + ### checks for system services and user specified options + +-echo "$as_me:6129: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo "$as_me:6151: checking for sys/wait.h that is POSIX.1 compatible" >&5 + echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 + if test "${ac_cv_header_sys_wait_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6135 "configure" ++#line 6157 "configure" + #include "confdefs.h" + #include + #include +@@ -6154,16 +6176,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6157: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6179: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6160: \$? = $ac_status" >&5 ++ echo "$as_me:6182: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6163: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6185: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6166: \$? = $ac_status" >&5 ++ echo "$as_me:6188: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_sys_wait_h=yes + else +@@ -6173,7 +6195,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:6176: result: $ac_cv_header_sys_wait_h" >&5 ++echo "$as_me:6198: result: $ac_cv_header_sys_wait_h" >&5 + echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 + if test $ac_cv_header_sys_wait_h = yes; then + +@@ -6183,14 +6205,14 @@ + + fi + +-echo "$as_me:6186: checking for POSIX wait functions" >&5 ++echo "$as_me:6208: checking for POSIX wait functions" >&5 + echo $ECHO_N "checking for POSIX wait functions... $ECHO_C" >&6 + if test "${cf_cv_posix_wait+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 6193 "configure" ++#line 6215 "configure" + #include "confdefs.h" + + #include +@@ -6213,16 +6235,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6216: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6238: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6219: \$? = $ac_status" >&5 ++ echo "$as_me:6241: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6222: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6244: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6225: \$? = $ac_status" >&5 ++ echo "$as_me:6247: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_wait=yes + else +@@ -6233,20 +6255,20 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:6236: result: $cf_cv_posix_wait" >&5 ++echo "$as_me:6258: result: $cf_cv_posix_wait" >&5 + echo "${ECHO_T}$cf_cv_posix_wait" >&6 + test "$cf_cv_posix_wait" = yes && cat >>confdefs.h <<\EOF + #define USE_POSIX_WAIT 1 + EOF + +-echo "$as_me:6242: checking if external sys_nerr is declared" >&5 ++echo "$as_me:6264: checking if external sys_nerr is declared" >&5 + echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_sys_nerr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 6249 "configure" ++#line 6271 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -6264,16 +6286,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6267: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6289: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6270: \$? = $ac_status" >&5 ++ echo "$as_me:6292: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6273: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6295: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6276: \$? = $ac_status" >&5 ++ echo "$as_me:6298: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_sys_nerr=yes + else +@@ -6284,7 +6306,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:6287: result: $cf_cv_dcl_sys_nerr" >&5 ++echo "$as_me:6309: result: $cf_cv_dcl_sys_nerr" >&5 + echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 + + if test "$cf_cv_dcl_sys_nerr" = no ; then +@@ -6299,14 +6321,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:6302: checking if external sys_nerr exists" >&5 ++echo "$as_me:6324: checking if external sys_nerr exists" >&5 + echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 + if test "${cf_cv_have_sys_nerr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 6309 "configure" ++#line 6331 "configure" + #include "confdefs.h" + + #undef sys_nerr +@@ -6321,16 +6343,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6324: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6346: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6327: \$? = $ac_status" >&5 ++ echo "$as_me:6349: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6330: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6352: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6333: \$? = $ac_status" >&5 ++ echo "$as_me:6355: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_sys_nerr=yes + else +@@ -6341,7 +6363,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:6344: result: $cf_cv_have_sys_nerr" >&5 ++echo "$as_me:6366: result: $cf_cv_have_sys_nerr" >&5 + echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 + + if test "$cf_cv_have_sys_nerr" = yes ; then +@@ -6354,14 +6376,14 @@ + + fi + +-echo "$as_me:6357: checking if external sys_errlist is declared" >&5 ++echo "$as_me:6379: checking if external sys_errlist is declared" >&5 + echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_sys_errlist+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 6364 "configure" ++#line 6386 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -6379,16 +6401,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6404: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6385: \$? = $ac_status" >&5 ++ echo "$as_me:6407: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6388: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6410: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6391: \$? = $ac_status" >&5 ++ echo "$as_me:6413: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_sys_errlist=yes + else +@@ -6399,7 +6421,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:6402: result: $cf_cv_dcl_sys_errlist" >&5 ++echo "$as_me:6424: result: $cf_cv_dcl_sys_errlist" >&5 + echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 + + if test "$cf_cv_dcl_sys_errlist" = no ; then +@@ -6414,14 +6436,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:6417: checking if external sys_errlist exists" >&5 ++echo "$as_me:6439: checking if external sys_errlist exists" >&5 + echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 + if test "${cf_cv_have_sys_errlist+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 6424 "configure" ++#line 6446 "configure" + #include "confdefs.h" + + #undef sys_errlist +@@ -6436,16 +6458,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6439: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6461: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6442: \$? = $ac_status" >&5 ++ echo "$as_me:6464: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6445: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6448: \$? = $ac_status" >&5 ++ echo "$as_me:6470: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_sys_errlist=yes + else +@@ -6456,7 +6478,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:6459: result: $cf_cv_have_sys_errlist" >&5 ++echo "$as_me:6481: result: $cf_cv_have_sys_errlist" >&5 + echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 + + if test "$cf_cv_have_sys_errlist" = yes ; then +@@ -6476,23 +6498,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:6479: checking for $ac_header" >&5 ++echo "$as_me:6501: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6485 "configure" ++#line 6507 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:6489: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:6511: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6495: \$? = $ac_status" >&5 ++ echo "$as_me:6517: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6511,7 +6533,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:6514: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:6536: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:6546: checking if we should define SYSV" >&5 + echo $ECHO_N "checking if we should define SYSV... $ECHO_C" >&6 + if test "${cf_cv_sysv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 6531 "configure" ++#line 6553 "configure" + #include "confdefs.h" + + #undef SYSV +@@ -6572,16 +6594,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6575: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6597: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6578: \$? = $ac_status" >&5 ++ echo "$as_me:6600: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6581: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6603: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6584: \$? = $ac_status" >&5 ++ echo "$as_me:6606: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sysv=yes + else +@@ -6592,13 +6614,13 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:6595: result: $cf_cv_sysv" >&5 ++echo "$as_me:6617: result: $cf_cv_sysv" >&5 + echo "${ECHO_T}$cf_cv_sysv" >&6 + test "$cf_cv_sysv" = yes && cat >>confdefs.h <<\EOF + #define SYSV 1 + EOF + +-echo "$as_me:6601: checking for elf_begin in -lelf" >&5 ++echo "$as_me:6623: checking for elf_begin in -lelf" >&5 + echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6 + if test "${ac_cv_lib_elf_elf_begin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6606,7 +6628,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lelf $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6609 "configure" ++#line 6631 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6625,16 +6647,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6628: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6650: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6631: \$? = $ac_status" >&5 ++ echo "$as_me:6653: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6634: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6656: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6637: \$? = $ac_status" >&5 ++ echo "$as_me:6659: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_elf_elf_begin=yes + else +@@ -6645,18 +6667,18 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6648: result: $ac_cv_lib_elf_elf_begin" >&5 ++echo "$as_me:6670: result: $ac_cv_lib_elf_elf_begin" >&5 + echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6 + if test $ac_cv_lib_elf_elf_begin = yes; then + +-echo "$as_me:6652: checking if this is an SVR4 system" >&5 ++echo "$as_me:6674: checking if this is an SVR4 system" >&5 + echo $ECHO_N "checking if this is an SVR4 system... $ECHO_C" >&6 + if test "${cf_cv_svr4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 6659 "configure" ++#line 6681 "configure" + #include "confdefs.h" + + #include +@@ -6682,16 +6704,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6707: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6688: \$? = $ac_status" >&5 ++ echo "$as_me:6710: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6691: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6713: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6694: \$? = $ac_status" >&5 ++ echo "$as_me:6716: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_svr4=yes + else +@@ -6702,7 +6724,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:6705: result: $cf_cv_svr4" >&5 ++echo "$as_me:6727: result: $cf_cv_svr4" >&5 + echo "${ECHO_T}$cf_cv_svr4" >&6 + + fi +@@ -6711,7 +6733,7 @@ + #define SVR4 1 + EOF + +-echo "$as_me:6714: checking for X" >&5 ++echo "$as_me:6736: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + + # Check whether --with-x or --without-x was given. +@@ -6808,17 +6830,17 @@ + # Guess where to find include files, by looking for Intrinsic.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF +-#line 6811 "configure" ++#line 6833 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:6815: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:6837: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6821: \$? = $ac_status" >&5 ++ echo "$as_me:6843: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6851,7 +6873,7 @@ + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6854 "configure" ++#line 6876 "configure" + #include "confdefs.h" + #include + int +@@ -6863,16 +6885,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6866: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6888: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6869: \$? = $ac_status" >&5 ++ echo "$as_me:6891: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6872: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6894: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6875: \$? = $ac_status" >&5 ++ echo "$as_me:6897: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. +@@ -6910,7 +6932,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$as_me:6913: result: $have_x" >&5 ++ echo "$as_me:6935: result: $have_x" >&5 + echo "${ECHO_T}$have_x" >&6 + no_x=yes + else +@@ -6920,7 +6942,7 @@ + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- echo "$as_me:6923: result: libraries $x_libraries, headers $x_includes" >&5 ++ echo "$as_me:6945: result: libraries $x_libraries, headers $x_includes" >&5 + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + +@@ -6944,11 +6966,11 @@ + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) +- echo "$as_me:6947: checking whether -R must be followed by a space" >&5 ++ echo "$as_me:6969: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +-#line 6951 "configure" ++#line 6973 "configure" + #include "confdefs.h" + + int +@@ -6960,16 +6982,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6963: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6985: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6966: \$? = $ac_status" >&5 ++ echo "$as_me:6988: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6969: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6991: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6972: \$? = $ac_status" >&5 ++ echo "$as_me:6994: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_nospace=yes + else +@@ -6979,13 +7001,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then +- echo "$as_me:6982: result: no" >&5 ++ echo "$as_me:7004: result: no" >&5 + echo "${ECHO_T}no" >&6 + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat >conftest.$ac_ext <<_ACEOF +-#line 6988 "configure" ++#line 7010 "configure" + #include "confdefs.h" + + int +@@ -6997,16 +7019,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7000: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7022: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7003: \$? = $ac_status" >&5 ++ echo "$as_me:7025: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7006: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7028: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7009: \$? = $ac_status" >&5 ++ echo "$as_me:7031: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes + else +@@ -7016,11 +7038,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then +- echo "$as_me:7019: result: yes" >&5 ++ echo "$as_me:7041: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me:7023: result: neither works" >&5 ++ echo "$as_me:7045: result: neither works" >&5 + echo "${ECHO_T}neither works" >&6 + fi + fi +@@ -7040,7 +7062,7 @@ + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF +-#line 7043 "configure" ++#line 7065 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7059,22 +7081,22 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7062: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7084: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7065: \$? = $ac_status" >&5 ++ echo "$as_me:7087: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7068: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7090: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7071: \$? = $ac_status" >&5 ++ echo "$as_me:7093: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:7077: checking for dnet_ntoa in -ldnet" >&5 ++echo "$as_me:7099: checking for dnet_ntoa in -ldnet" >&5 + echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7082,7 +7104,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7085 "configure" ++#line 7107 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7101,16 +7123,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7104: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7107: \$? = $ac_status" >&5 ++ echo "$as_me:7129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7110: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7113: \$? = $ac_status" >&5 ++ echo "$as_me:7135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +@@ -7121,14 +7143,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7124: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "$as_me:7146: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 + if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- echo "$as_me:7131: checking for dnet_ntoa in -ldnet_stub" >&5 ++ echo "$as_me:7153: checking for dnet_ntoa in -ldnet_stub" >&5 + echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7136,7 +7158,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7139 "configure" ++#line 7161 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7155,16 +7177,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7158: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7180: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7161: \$? = $ac_status" >&5 ++ echo "$as_me:7183: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7164: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7167: \$? = $ac_status" >&5 ++ echo "$as_me:7189: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +@@ -7175,7 +7197,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7178: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "$as_me:7200: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 + if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +@@ -7194,13 +7216,13 @@ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- echo "$as_me:7197: checking for gethostbyname" >&5 ++ echo "$as_me:7219: checking for gethostbyname" >&5 + echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 + if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7203 "configure" ++#line 7225 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname (); below. */ +@@ -7231,16 +7253,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7234: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7256: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7237: \$? = $ac_status" >&5 ++ echo "$as_me:7259: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7240: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7262: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7243: \$? = $ac_status" >&5 ++ echo "$as_me:7265: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes + else +@@ -7250,11 +7272,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7253: result: $ac_cv_func_gethostbyname" >&5 ++echo "$as_me:7275: result: $ac_cv_func_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 + + if test $ac_cv_func_gethostbyname = no; then +- echo "$as_me:7257: checking for gethostbyname in -lnsl" >&5 ++ echo "$as_me:7279: checking for gethostbyname in -lnsl" >&5 + echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 + if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7262,7 +7284,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7265 "configure" ++#line 7287 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7281,16 +7303,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7284: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7306: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7287: \$? = $ac_status" >&5 ++ echo "$as_me:7309: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7290: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7312: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7293: \$? = $ac_status" >&5 ++ echo "$as_me:7315: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes + else +@@ -7301,14 +7323,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7304: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "$as_me:7326: result: $ac_cv_lib_nsl_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 + if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- echo "$as_me:7311: checking for gethostbyname in -lbsd" >&5 ++ echo "$as_me:7333: checking for gethostbyname in -lbsd" >&5 + echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7316,7 +7338,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7319 "configure" ++#line 7341 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7335,16 +7357,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7338: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7360: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7341: \$? = $ac_status" >&5 ++ echo "$as_me:7363: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7344: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7366: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7347: \$? = $ac_status" >&5 ++ echo "$as_me:7369: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes + else +@@ -7355,7 +7377,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7358: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "$as_me:7380: result: $ac_cv_lib_bsd_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 + if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +@@ -7371,13 +7393,13 @@ + # variants that don't use the nameserver (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- echo "$as_me:7374: checking for connect" >&5 ++ echo "$as_me:7396: checking for connect" >&5 + echo $ECHO_N "checking for connect... $ECHO_C" >&6 + if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7380 "configure" ++#line 7402 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect (); below. */ +@@ -7408,16 +7430,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7411: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7433: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7414: \$? = $ac_status" >&5 ++ echo "$as_me:7436: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7417: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7439: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7420: \$? = $ac_status" >&5 ++ echo "$as_me:7442: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes + else +@@ -7427,11 +7449,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7430: result: $ac_cv_func_connect" >&5 ++echo "$as_me:7452: result: $ac_cv_func_connect" >&5 + echo "${ECHO_T}$ac_cv_func_connect" >&6 + + if test $ac_cv_func_connect = no; then +- echo "$as_me:7434: checking for connect in -lsocket" >&5 ++ echo "$as_me:7456: checking for connect in -lsocket" >&5 + echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7439,7 +7461,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7442 "configure" ++#line 7464 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7458,16 +7480,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7461: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7483: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7464: \$? = $ac_status" >&5 ++ echo "$as_me:7486: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7467: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7489: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7470: \$? = $ac_status" >&5 ++ echo "$as_me:7492: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes + else +@@ -7478,7 +7500,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7481: result: $ac_cv_lib_socket_connect" >&5 ++echo "$as_me:7503: result: $ac_cv_lib_socket_connect" >&5 + echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 + if test $ac_cv_lib_socket_connect = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +@@ -7487,13 +7509,13 @@ + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- echo "$as_me:7490: checking for remove" >&5 ++ echo "$as_me:7512: checking for remove" >&5 + echo $ECHO_N "checking for remove... $ECHO_C" >&6 + if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7496 "configure" ++#line 7518 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char remove (); below. */ +@@ -7524,16 +7546,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7527: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7549: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7530: \$? = $ac_status" >&5 ++ echo "$as_me:7552: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7533: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7555: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7536: \$? = $ac_status" >&5 ++ echo "$as_me:7558: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes + else +@@ -7543,11 +7565,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7546: result: $ac_cv_func_remove" >&5 ++echo "$as_me:7568: result: $ac_cv_func_remove" >&5 + echo "${ECHO_T}$ac_cv_func_remove" >&6 + + if test $ac_cv_func_remove = no; then +- echo "$as_me:7550: checking for remove in -lposix" >&5 ++ echo "$as_me:7572: checking for remove in -lposix" >&5 + echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7555,7 +7577,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7558 "configure" ++#line 7580 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7574,16 +7596,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7577: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7599: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7580: \$? = $ac_status" >&5 ++ echo "$as_me:7602: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7583: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7605: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7586: \$? = $ac_status" >&5 ++ echo "$as_me:7608: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes + else +@@ -7594,7 +7616,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7597: result: $ac_cv_lib_posix_remove" >&5 ++echo "$as_me:7619: result: $ac_cv_lib_posix_remove" >&5 + echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 + if test $ac_cv_lib_posix_remove = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +@@ -7603,13 +7625,13 @@ + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- echo "$as_me:7606: checking for shmat" >&5 ++ echo "$as_me:7628: checking for shmat" >&5 + echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7612 "configure" ++#line 7634 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shmat (); below. */ +@@ -7640,16 +7662,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7643: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7665: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7646: \$? = $ac_status" >&5 ++ echo "$as_me:7668: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7649: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7671: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7652: \$? = $ac_status" >&5 ++ echo "$as_me:7674: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes + else +@@ -7659,11 +7681,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7662: result: $ac_cv_func_shmat" >&5 ++echo "$as_me:7684: result: $ac_cv_func_shmat" >&5 + echo "${ECHO_T}$ac_cv_func_shmat" >&6 + + if test $ac_cv_func_shmat = no; then +- echo "$as_me:7666: checking for shmat in -lipc" >&5 ++ echo "$as_me:7688: checking for shmat in -lipc" >&5 + echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7671,7 +7693,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7674 "configure" ++#line 7696 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7690,16 +7712,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7693: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7715: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7696: \$? = $ac_status" >&5 ++ echo "$as_me:7718: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7699: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7721: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7702: \$? = $ac_status" >&5 ++ echo "$as_me:7724: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes + else +@@ -7710,7 +7732,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7713: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "$as_me:7735: result: $ac_cv_lib_ipc_shmat" >&5 + echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 + if test $ac_cv_lib_ipc_shmat = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +@@ -7728,7 +7750,7 @@ + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- echo "$as_me:7731: checking for IceConnectionNumber in -lICE" >&5 ++ echo "$as_me:7753: checking for IceConnectionNumber in -lICE" >&5 + echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 + if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7736,7 +7758,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7739 "configure" ++#line 7761 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7755,16 +7777,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7758: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7780: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7761: \$? = $ac_status" >&5 ++ echo "$as_me:7783: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7764: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7786: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7767: \$? = $ac_status" >&5 ++ echo "$as_me:7789: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +@@ -7775,7 +7797,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7778: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "$as_me:7800: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 + if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +@@ -7869,7 +7891,7 @@ + + if test "$cf_check_cflags" != "$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 7872 "configure" ++#line 7894 "configure" + #include "confdefs.h" + #include + int +@@ -7881,16 +7903,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7884: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7906: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7887: \$? = $ac_status" >&5 ++ echo "$as_me:7909: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7890: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7912: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7893: \$? = $ac_status" >&5 ++ echo "$as_me:7915: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7907,13 +7929,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +-echo "$as_me:7910: checking for XOpenDisplay" >&5 ++echo "$as_me:7932: checking for XOpenDisplay" >&5 + echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 + if test "${ac_cv_func_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7916 "configure" ++#line 7938 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XOpenDisplay (); below. */ +@@ -7944,16 +7966,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7947: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7969: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7950: \$? = $ac_status" >&5 ++ echo "$as_me:7972: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7953: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7975: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7956: \$? = $ac_status" >&5 ++ echo "$as_me:7978: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XOpenDisplay=yes + else +@@ -7963,13 +7985,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7966: result: $ac_cv_func_XOpenDisplay" >&5 ++echo "$as_me:7988: result: $ac_cv_func_XOpenDisplay" >&5 + echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 + if test $ac_cv_func_XOpenDisplay = yes; then + : + else + +-echo "$as_me:7972: checking for XOpenDisplay in -lX11" >&5 ++echo "$as_me:7994: checking for XOpenDisplay in -lX11" >&5 + echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 + if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7977,7 +7999,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7980 "configure" ++#line 8002 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7996,16 +8018,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7999: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8021: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8002: \$? = $ac_status" >&5 ++ echo "$as_me:8024: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8005: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8008: \$? = $ac_status" >&5 ++ echo "$as_me:8030: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -8016,7 +8038,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8019: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:8041: result: $ac_cv_lib_X11_XOpenDisplay" >&5 + echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 + if test $ac_cv_lib_X11_XOpenDisplay = yes; then + LIBS="-lX11 $LIBS" +@@ -8024,13 +8046,13 @@ + + fi + +-echo "$as_me:8027: checking for XtAppInitialize" >&5 ++echo "$as_me:8049: checking for XtAppInitialize" >&5 + echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 + if test "${ac_cv_func_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8033 "configure" ++#line 8055 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XtAppInitialize (); below. */ +@@ -8061,16 +8083,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8064: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8086: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8067: \$? = $ac_status" >&5 ++ echo "$as_me:8089: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8070: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8092: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8073: \$? = $ac_status" >&5 ++ echo "$as_me:8095: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XtAppInitialize=yes + else +@@ -8080,13 +8102,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8083: result: $ac_cv_func_XtAppInitialize" >&5 ++echo "$as_me:8105: result: $ac_cv_func_XtAppInitialize" >&5 + echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 + if test $ac_cv_func_XtAppInitialize = yes; then + : + else + +-echo "$as_me:8089: checking for XtAppInitialize in -lXt" >&5 ++echo "$as_me:8111: checking for XtAppInitialize in -lXt" >&5 + echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 + if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8094,7 +8116,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8097 "configure" ++#line 8119 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8113,16 +8135,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8116: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8138: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8119: \$? = $ac_status" >&5 ++ echo "$as_me:8141: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8122: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8144: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8125: \$? = $ac_status" >&5 ++ echo "$as_me:8147: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtAppInitialize=yes + else +@@ -8133,7 +8155,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8136: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 ++echo "$as_me:8158: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 + echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 + if test $ac_cv_lib_Xt_XtAppInitialize = yes; then + cat >>confdefs.h <<\EOF +@@ -8147,7 +8169,7 @@ + fi + + if test $cf_have_X_LIBS = no ; then +- { echo "$as_me:8150: WARNING: Unable to successfully link X Toolkit library (-lXt) with ++ { echo "$as_me:8172: WARNING: Unable to successfully link X Toolkit library (-lXt) with + test program. You will have to check and add the proper libraries by hand + to makefile." >&5 + echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with +@@ -8162,23 +8184,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:8165: checking for $ac_header" >&5 ++echo "$as_me:8187: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8171 "configure" ++#line 8193 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8175: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:8197: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:8181: \$? = $ac_status" >&5 ++ echo "$as_me:8203: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8197,7 +8219,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:8200: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:8222: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:8234: checking if you want to link with Xaw 3d library" >&5 + echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 + withval= + +@@ -8220,14 +8242,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=Xaw3d +- echo "$as_me:8223: result: yes" >&5 ++ echo "$as_me:8245: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:8226: result: no" >&5 ++ echo "$as_me:8248: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:8230: checking if you want to link with neXT Athena library" >&5 ++echo "$as_me:8252: checking if you want to link with neXT Athena library" >&5 + echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 + withval= + +@@ -8238,14 +8260,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=neXtaw +- echo "$as_me:8241: result: yes" >&5 ++ echo "$as_me:8263: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:8244: result: no" >&5 ++ echo "$as_me:8266: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:8248: checking if you want to link with Athena-Plus library" >&5 ++echo "$as_me:8270: checking if you want to link with Athena-Plus library" >&5 + echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 + withval= + +@@ -8256,14 +8278,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=XawPlus +- echo "$as_me:8259: result: yes" >&5 ++ echo "$as_me:8281: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:8262: result: no" >&5 ++ echo "$as_me:8284: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:8266: checking for XextCreateExtension in -lXext" >&5 ++echo "$as_me:8288: checking for XextCreateExtension in -lXext" >&5 + echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 + if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8271,7 +8293,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8274 "configure" ++#line 8296 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8290,16 +8312,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8293: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8315: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8296: \$? = $ac_status" >&5 ++ echo "$as_me:8318: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8299: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8321: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8302: \$? = $ac_status" >&5 ++ echo "$as_me:8324: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XextCreateExtension=yes + else +@@ -8310,7 +8332,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8313: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 ++echo "$as_me:8335: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 + echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 + if test $ac_cv_lib_Xext_XextCreateExtension = yes; then + LIBS="-lXext $LIBS" +@@ -8332,14 +8354,14 @@ + cf_test=X11/$cf_x_athena_root/SimpleMenu.h + if test $cf_path != default ; then + CPPFLAGS="-I$cf_path/include $cf_save" +- echo "$as_me:8335: checking for $cf_test in $cf_path" >&5 ++ echo "$as_me:8357: checking for $cf_test in $cf_path" >&5 + echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 + else +- echo "$as_me:8338: checking for $cf_test" >&5 ++ echo "$as_me:8360: checking for $cf_test" >&5 + echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 8342 "configure" ++#line 8364 "configure" + #include "confdefs.h" + + #include +@@ -8353,16 +8375,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8356: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8378: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8359: \$? = $ac_status" >&5 ++ echo "$as_me:8381: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8362: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8384: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8365: \$? = $ac_status" >&5 ++ echo "$as_me:8387: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -8371,7 +8393,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:8374: result: $cf_result" >&5 ++ echo "$as_me:8396: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_include=$cf_path +@@ -8383,7 +8405,7 @@ + done + + if test -z "$cf_x_athena_include" ; then +- { echo "$as_me:8386: WARNING: Unable to successfully find Athena header files with test program" >&5 ++ { echo "$as_me:8408: WARNING: Unable to successfully find Athena header files with test program" >&5 + echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} + elif test "$cf_x_athena_include" != default ; then + CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" +@@ -8408,15 +8430,15 @@ + cf_test=XawSimpleMenuAddGlobalActions + if test $cf_path != default ; then + LIBS="-L$cf_path/lib $cf_lib $LIBS" +- echo "$as_me:8411: checking for $cf_lib in $cf_path" >&5 ++ echo "$as_me:8433: checking for $cf_lib in $cf_path" >&5 + echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 + else + LIBS="$cf_lib $LIBS" +- echo "$as_me:8415: checking for $cf_test in $cf_lib" >&5 ++ echo "$as_me:8437: checking for $cf_test in $cf_lib" >&5 + echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 8419 "configure" ++#line 8441 "configure" + #include "confdefs.h" + + int +@@ -8428,16 +8450,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8431: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8453: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8434: \$? = $ac_status" >&5 ++ echo "$as_me:8456: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8459: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8440: \$? = $ac_status" >&5 ++ echo "$as_me:8462: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -8446,7 +8468,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:8449: result: $cf_result" >&5 ++ echo "$as_me:8471: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_lib="$cf_lib" +@@ -8458,7 +8480,7 @@ + done + + if test -z "$cf_x_athena_lib" ; then +- { { echo "$as_me:8461: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 ++ { { echo "$as_me:8483: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8469,14 +8491,14 @@ + #define $cf_x_athena_LIBS 1 + EOF + +-echo "$as_me:8472: checking for declaration of fd_set" >&5 ++echo "$as_me:8494: checking for declaration of fd_set" >&5 + echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 + if test "${cf_cv_type_fd_set+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + echo "trying sys/types alone" 1>&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 8479 "configure" ++#line 8501 "configure" + #include "confdefs.h" + + #include +@@ -8489,16 +8511,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8514: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8495: \$? = $ac_status" >&5 ++ echo "$as_me:8517: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8498: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8520: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8501: \$? = $ac_status" >&5 ++ echo "$as_me:8523: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_fd_set=sys/types.h + else +@@ -8506,7 +8528,7 @@ + cat conftest.$ac_ext >&5 + echo "trying X11/Xpoll.h" 1>&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 8509 "configure" ++#line 8531 "configure" + #include "confdefs.h" + + #ifdef HAVE_X11_XPOLL_H +@@ -8521,16 +8543,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8524: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8546: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8527: \$? = $ac_status" >&5 ++ echo "$as_me:8549: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8530: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8552: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8533: \$? = $ac_status" >&5 ++ echo "$as_me:8555: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_fd_set=X11/Xpoll.h + else +@@ -8538,7 +8560,7 @@ + cat conftest.$ac_ext >&5 + echo "trying sys/select.h" 1>&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 8541 "configure" ++#line 8563 "configure" + #include "confdefs.h" + + #include +@@ -8552,16 +8574,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8555: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8577: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8558: \$? = $ac_status" >&5 ++ echo "$as_me:8580: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8561: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8583: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8564: \$? = $ac_status" >&5 ++ echo "$as_me:8586: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_fd_set=sys/select.h + else +@@ -8575,7 +8597,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:8578: result: $cf_cv_type_fd_set" >&5 ++echo "$as_me:8600: result: $cf_cv_type_fd_set" >&5 + echo "${ECHO_T}$cf_cv_type_fd_set" >&6 + if test $cf_cv_type_fd_set = sys/select.h ; then + cat >>confdefs.h <<\EOF +@@ -8584,14 +8606,14 @@ + + fi + +-echo "$as_me:8587: checking for IRIX 6.5 baud-rate redefinitions" >&5 ++echo "$as_me:8609: checking for IRIX 6.5 baud-rate redefinitions" >&5 + echo $ECHO_N "checking for IRIX 6.5 baud-rate redefinitions... $ECHO_C" >&6 + if test "${cf_cv_termio_c_ispeed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 8594 "configure" ++#line 8616 "configure" + #include "confdefs.h" + + #include +@@ -8609,16 +8631,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8612: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8634: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8615: \$? = $ac_status" >&5 ++ echo "$as_me:8637: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8618: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8640: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8621: \$? = $ac_status" >&5 ++ echo "$as_me:8643: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_termio_c_ispeed=yes + +@@ -8630,7 +8652,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8633: result: $cf_cv_termio_c_ispeed" >&5 ++echo "$as_me:8655: result: $cf_cv_termio_c_ispeed" >&5 + echo "${ECHO_T}$cf_cv_termio_c_ispeed" >&6 + test "$cf_cv_termio_c_ispeed" = yes && cat >>confdefs.h <<\EOF + #define HAVE_TERMIO_C_ISPEED 1 +@@ -8643,7 +8665,7 @@ + case $host_os in #(vi + freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work. + +-echo "$as_me:8646: checking for openpty in -lutil" >&5 ++echo "$as_me:8668: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8651,7 +8673,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8654 "configure" ++#line 8676 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8670,16 +8692,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8673: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8676: \$? = $ac_status" >&5 ++ echo "$as_me:8698: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8679: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8682: \$? = $ac_status" >&5 ++ echo "$as_me:8704: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -8690,7 +8712,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8693: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:8715: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test $ac_cv_lib_util_openpty = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:8732: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8716 "configure" ++#line 8738 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -8744,16 +8766,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8747: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8769: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8750: \$? = $ac_status" >&5 ++ echo "$as_me:8772: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8753: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8775: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8756: \$? = $ac_status" >&5 ++ echo "$as_me:8778: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -8763,7 +8785,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8766: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:8788: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:8797: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8780,7 +8802,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8783 "configure" ++#line 8805 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8799,16 +8821,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8802: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8824: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8805: \$? = $ac_status" >&5 ++ echo "$as_me:8827: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8808: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8811: \$? = $ac_status" >&5 ++ echo "$as_me:8833: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -8819,7 +8841,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8822: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:8844: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test $ac_cv_lib_util_openpty = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:8861: checking for XKB Bell extension" >&5 + echo $ECHO_N "checking for XKB Bell extension... $ECHO_C" >&6 + if test "${cf_cv_xkb_bell_ext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 8846 "configure" ++#line 8868 "configure" + #include "confdefs.h" + + #include /* has the prototype */ +@@ -8864,16 +8886,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8867: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8889: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8870: \$? = $ac_status" >&5 ++ echo "$as_me:8892: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8873: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8876: \$? = $ac_status" >&5 ++ echo "$as_me:8898: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xkb_bell_ext=yes + else +@@ -8884,7 +8906,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:8887: result: $cf_cv_xkb_bell_ext" >&5 ++echo "$as_me:8909: result: $cf_cv_xkb_bell_ext" >&5 + echo "${ECHO_T}$cf_cv_xkb_bell_ext" >&6 + + test "$cf_cv_xkb_bell_ext" = yes && cat >>confdefs.h <<\EOF +@@ -8894,13 +8916,13 @@ + for ac_func in Xutf8LookupString + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:8897: checking for $ac_func" >&5 ++echo "$as_me:8919: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8903 "configure" ++#line 8925 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -8931,16 +8953,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8934: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8956: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8937: \$? = $ac_status" >&5 ++ echo "$as_me:8959: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8940: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8962: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8943: \$? = $ac_status" >&5 ++ echo "$as_me:8965: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -8950,7 +8972,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8953: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:8975: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:8991: checking if you want narrow prototypes for X libraries" >&5 + echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6 + + case `$ac_config_guess` in #(vi +@@ -8992,10 +9014,10 @@ + enable_narrowproto=$cf_default_narrowproto + + fi; +-echo "$as_me:8995: result: $enable_narrowproto" >&5 ++echo "$as_me:9017: result: $enable_narrowproto" >&5 + echo "${ECHO_T}$enable_narrowproto" >&6 + +-echo "$as_me:8998: checking if we should use imake to help" >&5 ++echo "$as_me:9020: checking if we should use imake to help" >&5 + echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6 + + # Check whether --enable-imake or --disable-imake was given. +@@ -9012,7 +9034,7 @@ + enable_imake=yes + + fi; +-echo "$as_me:9015: result: $enable_imake" >&5 ++echo "$as_me:9037: result: $enable_imake" >&5 + echo "${ECHO_T}$enable_imake" >&6 + + if test "$enable_imake" = yes ; then +@@ -9021,7 +9043,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:9024: checking for $ac_word" >&5 ++echo "$as_me:9046: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_IMAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9038,7 +9060,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_IMAKE="$ac_dir/$ac_word" +- echo "$as_me:9041: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:9063: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -9049,10 +9071,10 @@ + IMAKE=$ac_cv_path_IMAKE + + if test -n "$IMAKE"; then +- echo "$as_me:9052: result: $IMAKE" >&5 ++ echo "$as_me:9074: result: $IMAKE" >&5 + echo "${ECHO_T}$IMAKE" >&6 + else +- echo "$as_me:9055: result: no" >&5 ++ echo "$as_me:9077: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9125,7 +9147,7 @@ + esac + done + if test -z "$cf_config" ; then +- { echo "$as_me:9128: WARNING: Could not find imake config-directory" >&5 ++ { echo "$as_me:9150: WARNING: Could not find imake config-directory" >&5 + echo "$as_me: WARNING: Could not find imake config-directory" >&2;} + else + cf_imake_opts="$cf_imake_opts -I$cf_config" +@@ -9134,7 +9156,7 @@ + test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 + + else +- { echo "$as_me:9137: WARNING: Cannot run $IMAKE" >&5 ++ { echo "$as_me:9159: WARNING: Cannot run $IMAKE" >&5 + echo "$as_me: WARNING: Cannot run $IMAKE" >&2;} + fi + fi +@@ -9390,7 +9412,7 @@ + + fi + +-echo "$as_me:9393: checking for default terminal-id" >&5 ++echo "$as_me:9415: checking for default terminal-id" >&5 + echo $ECHO_N "checking for default terminal-id... $ECHO_C" >&6 + + # Check whether --with-terminal-id or --without-terminal-id was given. +@@ -9400,7 +9422,7 @@ + else + default_termid=vt100 + fi; +-echo "$as_me:9403: result: $default_termid" >&5 ++echo "$as_me:9425: result: $default_termid" >&5 + echo "${ECHO_T}$default_termid" >&6 + case $default_termid in + vt*) default_termid=`echo $default_termid | sed -e 's/^..//'` +@@ -9410,7 +9432,7 @@ + #define DFT_DECID "$default_termid" + EOF + +-echo "$as_me:9413: checking for default terminal-type" >&5 ++echo "$as_me:9435: checking for default terminal-type" >&5 + echo $ECHO_N "checking for default terminal-type... $ECHO_C" >&6 + + # Check whether --with-terminal-type or --without-terminal-type was given. +@@ -9420,13 +9442,13 @@ + else + default_TERM=xterm + fi; +-echo "$as_me:9423: result: $default_TERM" >&5 ++echo "$as_me:9445: result: $default_TERM" >&5 + echo "${ECHO_T}$default_TERM" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:9451: checking for private terminfo-directory" >&5 + echo $ECHO_N "checking for private terminfo-directory... $ECHO_C" >&6 + + # Check whether --with-own-terminfo or --without-own-terminfo was given. +@@ -9436,10 +9458,10 @@ + else + TERMINFO_DIR=${TERMINFO-none} + fi; +-echo "$as_me:9439: result: $TERMINFO_DIR" >&5 ++echo "$as_me:9461: result: $TERMINFO_DIR" >&5 + echo "${ECHO_T}$TERMINFO_DIR" >&6 + if test "$TERMINFO_DIR" = yes ; then +- { echo "$as_me:9442: WARNING: no value given" >&5 ++ { echo "$as_me:9464: WARNING: no value given" >&5 + echo "$as_me: WARNING: no value given" >&2;} + elif test "$TERMINFO_DIR" != none ; then + if test -d $TERMINFO_DIR ; then +@@ -9448,7 +9470,7 @@ + EOF + + else +- { echo "$as_me:9451: WARNING: not a directory" >&5 ++ { echo "$as_me:9473: WARNING: not a directory" >&5 + echo "$as_me: WARNING: not a directory" >&2;} + fi + elif test "$prefix" != NONE ; then +@@ -9466,7 +9488,7 @@ + + ############################################################################### + +-echo "$as_me:9469: checking if you want active-icons" >&5 ++echo "$as_me:9491: checking if you want active-icons" >&5 + echo $ECHO_N "checking if you want active-icons... $ECHO_C" >&6 + + # Check whether --enable-active-icon or --disable-active-icon was given. +@@ -9483,7 +9505,7 @@ + enable_active_icon=yes + + fi; +-echo "$as_me:9486: result: $enable_active_icon" >&5 ++echo "$as_me:9508: result: $enable_active_icon" >&5 + echo "${ECHO_T}$enable_active_icon" >&6 + if test "$enable_active_icon" = no ; then + cat >>confdefs.h <<\EOF +@@ -9492,7 +9514,7 @@ + + fi + +-echo "$as_me:9495: checking if you want ANSI color" >&5 ++echo "$as_me:9517: checking if you want ANSI color" >&5 + echo $ECHO_N "checking if you want ANSI color... $ECHO_C" >&6 + + # Check whether --enable-ansi-color or --disable-ansi-color was given. +@@ -9509,7 +9531,7 @@ + enable_ansi_color=yes + + fi; +-echo "$as_me:9512: result: $enable_ansi_color" >&5 ++echo "$as_me:9534: result: $enable_ansi_color" >&5 + echo "${ECHO_T}$enable_ansi_color" >&6 + test "$enable_ansi_color" = no && cat >>confdefs.h <<\EOF + #define OPT_ISO_COLORS 0 +@@ -9517,7 +9539,7 @@ + + if test "$enable_ansi_color" = yes ; then + +- echo "$as_me:9520: checking if you want 16 colors like aixterm" >&5 ++ echo "$as_me:9542: checking if you want 16 colors like aixterm" >&5 + echo $ECHO_N "checking if you want 16 colors like aixterm... $ECHO_C" >&6 + + # Check whether --enable-16-color or --disable-16-color was given. +@@ -9534,13 +9556,13 @@ + enable_16_color=yes + + fi; +- echo "$as_me:9537: result: $enable_16_color" >&5 ++ echo "$as_me:9559: result: $enable_16_color" >&5 + echo "${ECHO_T}$enable_16_color" >&6 + test "$enable_16_color" = no && cat >>confdefs.h <<\EOF + #define OPT_AIX_COLORS 0 + EOF + +- echo "$as_me:9543: checking if you want 256 colors" >&5 ++ echo "$as_me:9565: checking if you want 256 colors" >&5 + echo $ECHO_N "checking if you want 256 colors... $ECHO_C" >&6 + + # Check whether --enable-256-color or --disable-256-color was given. +@@ -9557,7 +9579,7 @@ + enable_256_color=no + + fi; +- echo "$as_me:9560: result: $enable_256_color" >&5 ++ echo "$as_me:9582: result: $enable_256_color" >&5 + echo "${ECHO_T}$enable_256_color" >&6 + if test "$enable_256_color" = yes ; then + CHARPROC_DEPS="$CHARPROC_DEPS 256colres.h" +@@ -9567,7 +9589,7 @@ + EOF + + else +- echo "$as_me:9570: checking if you want 88 colors" >&5 ++ echo "$as_me:9592: checking if you want 88 colors" >&5 + echo $ECHO_N "checking if you want 88 colors... $ECHO_C" >&6 + + # Check whether --enable-88-color or --disable-88-color was given. +@@ -9584,7 +9606,7 @@ + enable_88_color=no + + fi; +- echo "$as_me:9587: result: $enable_88_color" >&5 ++ echo "$as_me:9609: result: $enable_88_color" >&5 + echo "${ECHO_T}$enable_88_color" >&6 + if test "$enable_88_color" = yes ; then + CHARPROC_DEPS="$CHARPROC_DEPS 88colres.h" +@@ -9598,7 +9620,7 @@ + + fi + +-echo "$as_me:9601: checking if you want blinking cursor" >&5 ++echo "$as_me:9623: checking if you want blinking cursor" >&5 + echo $ECHO_N "checking if you want blinking cursor... $ECHO_C" >&6 + + # Check whether --enable-blink-cursor or --disable-blink-cursor was given. +@@ -9615,13 +9637,13 @@ + enable_blink_curs=yes + + fi; +-echo "$as_me:9618: result: $enable_blink_curs" >&5 ++echo "$as_me:9640: result: $enable_blink_curs" >&5 + echo "${ECHO_T}$enable_blink_curs" >&6 + test "$enable_blink_curs" = no && cat >>confdefs.h <<\EOF + #define OPT_BLINK_CURS 0 + EOF + +-echo "$as_me:9624: checking if you want to ignore Linux's broken palette-strings" >&5 ++echo "$as_me:9646: checking if you want to ignore Linux's broken palette-strings" >&5 + echo $ECHO_N "checking if you want to ignore Linux's broken palette-strings... $ECHO_C" >&6 + + case $host_os in #(vi +@@ -9645,7 +9667,7 @@ + enable_broken_osc=$enableval + + fi; +-echo "$as_me:9648: result: $enable_broken_osc" >&5 ++echo "$as_me:9670: result: $enable_broken_osc" >&5 + echo "${ECHO_T}$enable_broken_osc" >&6 + if test "$enable_broken_osc" = yes ; then + cat >>confdefs.h <<\EOF +@@ -9659,7 +9681,7 @@ + + fi + +-echo "$as_me:9662: checking if you want to allow broken string-terminators" >&5 ++echo "$as_me:9684: checking if you want to allow broken string-terminators" >&5 + echo $ECHO_N "checking if you want to allow broken string-terminators... $ECHO_C" >&6 + + # Check whether --enable-broken-st or --disable-broken-st was given. +@@ -9676,13 +9698,13 @@ + enable_broken_st=no + + fi; +-echo "$as_me:9679: result: $enable_broken_st" >&5 ++echo "$as_me:9701: result: $enable_broken_st" >&5 + echo "${ECHO_T}$enable_broken_st" >&6 + test "$enable_broken_st" = no && cat >>confdefs.h <<\EOF + #define OPT_BROKEN_ST 0 + EOF + +-echo "$as_me:9685: checking if you want printable 128-159" >&5 ++echo "$as_me:9707: checking if you want printable 128-159" >&5 + echo $ECHO_N "checking if you want printable 128-159... $ECHO_C" >&6 + + # Check whether --enable-c1-print or --disable-c1-print was given. +@@ -9699,7 +9721,7 @@ + enable_c1_print=yes + + fi; +-echo "$as_me:9702: result: $enable_c1_print" >&5 ++echo "$as_me:9724: result: $enable_c1_print" >&5 + echo "${ECHO_T}$enable_c1_print" >&6 + test "$enable_c1_print" = no && cat >>confdefs.h <<\EOF + #define OPT_C1_PRINT 0 +@@ -9707,7 +9729,7 @@ + + if test "$enable_ansi_color" = yes ; then + +- echo "$as_me:9710: checking if you want bold colors mapped like IBM PC" >&5 ++ echo "$as_me:9732: checking if you want bold colors mapped like IBM PC" >&5 + echo $ECHO_N "checking if you want bold colors mapped like IBM PC... $ECHO_C" >&6 + + # Check whether --enable-bold-color or --disable-bold-color was given. +@@ -9724,13 +9746,13 @@ + enable_pc_color=yes + + fi; +- echo "$as_me:9727: result: $enable_pc_color" >&5 ++ echo "$as_me:9749: result: $enable_pc_color" >&5 + echo "${ECHO_T}$enable_pc_color" >&6 + test "$enable_pc_color" = no && cat >>confdefs.h <<\EOF + #define OPT_PC_COLORS 0 + EOF + +- echo "$as_me:9733: checking if you want separate color-classes" >&5 ++ echo "$as_me:9755: checking if you want separate color-classes" >&5 + echo $ECHO_N "checking if you want separate color-classes... $ECHO_C" >&6 + + # Check whether --enable-color-class or --disable-color-class was given. +@@ -9747,13 +9769,13 @@ + enable_color_class=yes + + fi; +- echo "$as_me:9750: result: $enable_color_class" >&5 ++ echo "$as_me:9772: result: $enable_color_class" >&5 + echo "${ECHO_T}$enable_color_class" >&6 + test "$enable_color_class" = no && cat >>confdefs.h <<\EOF + #define OPT_COLOR_CLASS FALSE + EOF + +- echo "$as_me:9756: checking if you want color-mode enabled by default" >&5 ++ echo "$as_me:9778: checking if you want color-mode enabled by default" >&5 + echo $ECHO_N "checking if you want color-mode enabled by default... $ECHO_C" >&6 + + # Check whether --enable-color-mode or --disable-color-mode was given. +@@ -9770,7 +9792,7 @@ + default_colormode=yes + + fi; +- echo "$as_me:9773: result: $default_colormode" >&5 ++ echo "$as_me:9795: result: $default_colormode" >&5 + echo "${ECHO_T}$default_colormode" >&6 + test "$default_colormode" = no && cat >>confdefs.h <<\EOF + #define DFT_COLORMODE FALSE +@@ -9778,7 +9800,7 @@ + + fi + +-echo "$as_me:9781: checking if you want support for color highlighting" >&5 ++echo "$as_me:9803: checking if you want support for color highlighting" >&5 + echo $ECHO_N "checking if you want support for color highlighting... $ECHO_C" >&6 + + # Check whether --enable-highlighting or --disable-highlighting was given. +@@ -9795,13 +9817,13 @@ + default_highlight=yes + + fi; +-echo "$as_me:9798: result: $default_highlight" >&5 ++echo "$as_me:9820: result: $default_highlight" >&5 + echo "${ECHO_T}$default_highlight" >&6 + test "$default_highlight" = no && cat >>confdefs.h <<\EOF + #define OPT_HIGHLIGHT_COLOR 0 + EOF + +-echo "$as_me:9804: checking if you want support for doublesize characters" >&5 ++echo "$as_me:9826: checking if you want support for doublesize characters" >&5 + echo $ECHO_N "checking if you want support for doublesize characters... $ECHO_C" >&6 + + # Check whether --enable-doublechars or --disable-doublechars was given. +@@ -9818,13 +9840,13 @@ + enable_doublechars=yes + + fi; +-echo "$as_me:9821: result: $enable_doublechars" >&5 ++echo "$as_me:9843: result: $enable_doublechars" >&5 + echo "${ECHO_T}$enable_doublechars" >&6 + test "$enable_doublechars" = no && cat >>confdefs.h <<\EOF + #define OPT_DEC_CHRSET 0 + EOF + +-echo "$as_me:9827: checking if you want fallback-support for box characters" >&5 ++echo "$as_me:9849: checking if you want fallback-support for box characters" >&5 + echo $ECHO_N "checking if you want fallback-support for box characters... $ECHO_C" >&6 + + # Check whether --enable-boxchars or --disable-boxchars was given. +@@ -9841,13 +9863,71 @@ + enable_boxchars=yes + + fi; +-echo "$as_me:9844: result: $enable_boxchars" >&5 ++echo "$as_me:9866: result: $enable_boxchars" >&5 + echo "${ECHO_T}$enable_boxchars" >&6 + test "$enable_boxchars" = no && cat >>confdefs.h <<\EOF + #define OPT_BOX_CHARS 0 + EOF + +-echo "$as_me:9850: checking if you want to use FreeType library" >&5 ++echo "$as_me:9872: checking if you want to allow spawning new xterms" >&5 ++echo $ECHO_N "checking if you want to allow spawning new xterms... $ECHO_C" >&6 ++ ++# Check whether --enable-exec-xterm or --disable-exec-xterm was given. ++if test "${enable_exec_xterm+set}" = set; then ++ enableval="$enable_exec_xterm" ++ test "$enableval" != yes && enableval=no ++ if test "$enableval" != "no" ; then ++ enable_exec_xterm=yes ++ else ++ enable_exec_xterm=no ++ fi ++else ++ enableval=no ++ enable_exec_xterm=no ++ ++fi; ++echo "$as_me:9889: result: $enable_exec_xterm" >&5 ++echo "${ECHO_T}$enable_exec_xterm" >&6 ++if test "$enable_exec_xterm" = yes ; then ++ ++echo "$as_me:9893: checking for proc tree with cwd-support" >&5 ++echo $ECHO_N "checking for proc tree with cwd-support... $ECHO_C" >&6 ++if test "${cf_cv_procfs_cwd+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cf_cv_procfs_cwd=no ++for cf_path in /proc /compat/linux/proc /usr/compat/linux/proc ++do ++ if test -d $cf_path && \ ++ test -d $cf_path/$$ && \ ++ ( test -d $cf_path/$$/cwd || \ ++ test -L $cf_path/$$/cwd ); then ++ cf_cv_procfs_cwd=$cf_path ++ break ++ fi ++done ++ ++fi ++echo "$as_me:9912: result: $cf_cv_procfs_cwd" >&5 ++echo "${ECHO_T}$cf_cv_procfs_cwd" >&6 ++ ++ if test "$cf_cv_procfs_cwd" = no ; then ++ { echo "$as_me:9916: WARNING: no suitable proc filesystem found" >&5 ++echo "$as_me: WARNING: no suitable proc filesystem found" >&2;} ++ else ++ cat >>confdefs.h <>confdefs.h <<\EOF ++#define OPT_EXEC_XTERM 1 ++EOF ++ ++ fi ++fi ++ ++echo "$as_me:9930: checking if you want to use FreeType library" >&5 + echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6 + + # Check whether --enable-freetype or --disable-freetype was given. +@@ -9864,7 +9944,7 @@ + enable_freetype=yes + + fi; +-echo "$as_me:9867: result: $enable_freetype" >&5 ++echo "$as_me:9947: result: $enable_freetype" >&5 + echo "${ECHO_T}$enable_freetype" >&6 + if test "$enable_freetype" = yes ; then + +@@ -9872,7 +9952,7 @@ + FREETYPE_CONFIG= + FREETYPE_PARAMS= + +-echo "$as_me:9875: checking if you specified -D/-I options for FreeType" >&5 ++echo "$as_me:9955: checking if you specified -D/-I options for FreeType" >&5 + echo $ECHO_N "checking if you specified -D/-I options for FreeType... $ECHO_C" >&6 + + # Check whether --with-freetype-cflags or --without-freetype-cflags was given. +@@ -9882,10 +9962,10 @@ + else + cf_cv_x_freetype_incs=no + fi; +-echo "$as_me:9885: result: $cf_cv_x_freetype_incs" >&5 ++echo "$as_me:9965: result: $cf_cv_x_freetype_incs" >&5 + echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 + +-echo "$as_me:9888: checking if you specified -L/-l options for FreeType" >&5 ++echo "$as_me:9968: checking if you specified -L/-l options for FreeType" >&5 + echo $ECHO_N "checking if you specified -L/-l options for FreeType... $ECHO_C" >&6 + + # Check whether --with-freetype-libs or --without-freetype-libs was given. +@@ -9895,12 +9975,12 @@ + else + cf_cv_x_freetype_libs=no + fi; +-echo "$as_me:9898: result: $cf_cv_x_freetype_libs" >&5 ++echo "$as_me:9978: result: $cf_cv_x_freetype_libs" >&5 + echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 + + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-echo "$as_me:9903: checking for $ac_word" >&5 ++echo "$as_me:9983: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_FREETYPE_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9917,7 +9997,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FREETYPE_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:9920: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:10000: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -9929,10 +10009,10 @@ + FREETYPE_PKG_CONFIG=$ac_cv_path_FREETYPE_PKG_CONFIG + + if test -n "$FREETYPE_PKG_CONFIG"; then +- echo "$as_me:9932: result: $FREETYPE_PKG_CONFIG" >&5 ++ echo "$as_me:10012: result: $FREETYPE_PKG_CONFIG" >&5 + echo "${ECHO_T}$FREETYPE_PKG_CONFIG" >&6 + else +- echo "$as_me:9935: result: no" >&5 ++ echo "$as_me:10015: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9942,7 +10022,7 @@ + else + # Extract the first word of "xft-config", so it can be a program name with args. + set dummy xft-config; ac_word=$2 +-echo "$as_me:9945: checking for $ac_word" >&5 ++echo "$as_me:10025: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_FREETYPE_XFT_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9959,7 +10039,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FREETYPE_XFT_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:9962: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:10042: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -9971,10 +10051,10 @@ + FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG + + if test -n "$FREETYPE_XFT_CONFIG"; then +- echo "$as_me:9974: result: $FREETYPE_XFT_CONFIG" >&5 ++ echo "$as_me:10054: result: $FREETYPE_XFT_CONFIG" >&5 + echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6 + else +- echo "$as_me:9977: result: no" >&5 ++ echo "$as_me:10057: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9984,7 +10064,7 @@ + cf_extra_freetype_libs="-lXft" + # Extract the first word of "freetype-config", so it can be a program name with args. + set dummy freetype-config; ac_word=$2 +-echo "$as_me:9987: checking for $ac_word" >&5 ++echo "$as_me:10067: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_FREETYPE_OLD_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10001,7 +10081,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FREETYPE_OLD_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:10004: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:10084: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -10013,10 +10093,10 @@ + FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG + + if test -n "$FREETYPE_OLD_CONFIG"; then +- echo "$as_me:10016: result: $FREETYPE_OLD_CONFIG" >&5 ++ echo "$as_me:10096: result: $FREETYPE_OLD_CONFIG" >&5 + echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6 + else +- echo "$as_me:10019: result: no" >&5 ++ echo "$as_me:10099: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10029,18 +10109,18 @@ + if test -n "$FREETYPE_CONFIG" ; then + + if test "$cf_cv_x_freetype_incs" = no ; then +-echo "$as_me:10032: checking for $FREETYPE_CONFIG cflags" >&5 ++echo "$as_me:10112: checking for $FREETYPE_CONFIG cflags" >&5 + echo $ECHO_N "checking for $FREETYPE_CONFIG cflags... $ECHO_C" >&6 + cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`" +-echo "$as_me:10035: result: $cf_cv_x_freetype_incs" >&5 ++echo "$as_me:10115: result: $cf_cv_x_freetype_incs" >&5 + echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 + fi + + if test "$cf_cv_x_freetype_libs" = no ; then +-echo "$as_me:10040: checking for $FREETYPE_CONFIG libs" >&5 ++echo "$as_me:10120: checking for $FREETYPE_CONFIG libs" >&5 + echo $ECHO_N "checking for $FREETYPE_CONFIG libs... $ECHO_C" >&6 + cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`" +-echo "$as_me:10043: result: $cf_cv_x_freetype_libs" >&5 ++echo "$as_me:10123: result: $cf_cv_x_freetype_libs" >&5 + echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 + fi + +@@ -10054,7 +10134,7 @@ + cf_cv_x_freetype_libs=-lXft + fi + +-echo "$as_me:10057: checking if we can link with FreeType libraries" >&5 ++echo "$as_me:10137: checking if we can link with FreeType libraries" >&5 + echo $ECHO_N "checking if we can link with FreeType libraries... $ECHO_C" >&6 + + cf_save_LIBS="$LIBS" +@@ -10064,7 +10144,7 @@ + CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLAGS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 10067 "configure" ++#line 10147 "configure" + #include "confdefs.h" + + #include +@@ -10080,16 +10160,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10083: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10163: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10086: \$? = $ac_status" >&5 ++ echo "$as_me:10166: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10089: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10169: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10092: \$? = $ac_status" >&5 ++ echo "$as_me:10172: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_found_freetype=yes + else +@@ -10098,7 +10178,7 @@ + cf_cv_found_freetype=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:10101: result: $cf_cv_found_freetype" >&5 ++echo "$as_me:10181: result: $cf_cv_found_freetype" >&5 + echo "${ECHO_T}$cf_cv_found_freetype" >&6 + + LIBS="$cf_save_LIBS" +@@ -10180,7 +10260,7 @@ + EOF + + else +- { echo "$as_me:10183: WARNING: No libraries found for FreeType" >&5 ++ { echo "$as_me:10263: WARNING: No libraries found for FreeType" >&5 + echo "$as_me: WARNING: No libraries found for FreeType" >&2;} + CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` + fi +@@ -10191,7 +10271,7 @@ + CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` + fi + +-echo "$as_me:10194: checking if you want support for HP-style function keys" >&5 ++echo "$as_me:10274: checking if you want support for HP-style function keys" >&5 + echo $ECHO_N "checking if you want support for HP-style function keys... $ECHO_C" >&6 + + # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given. +@@ -10208,7 +10288,7 @@ + enable_hp_fkeys=no + + fi; +-echo "$as_me:10211: result: $enable_hp_fkeys" >&5 ++echo "$as_me:10291: result: $enable_hp_fkeys" >&5 + echo "${ECHO_T}$enable_hp_fkeys" >&6 + if test "$enable_hp_fkeys" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10217,7 +10297,7 @@ + + fi + +-echo "$as_me:10220: checking if you want support for SCO-style function keys" >&5 ++echo "$as_me:10300: checking if you want support for SCO-style function keys" >&5 + echo $ECHO_N "checking if you want support for SCO-style function keys... $ECHO_C" >&6 + + # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given. +@@ -10234,7 +10314,7 @@ + enable_sco_fkeys=no + + fi; +-echo "$as_me:10237: result: $enable_sco_fkeys" >&5 ++echo "$as_me:10317: result: $enable_sco_fkeys" >&5 + echo "${ECHO_T}$enable_sco_fkeys" >&6 + if test "$enable_sco_fkeys" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10243,7 +10323,7 @@ + + fi + +-echo "$as_me:10246: checking if you want support for Sun-style function keys" >&5 ++echo "$as_me:10326: checking if you want support for Sun-style function keys" >&5 + echo $ECHO_N "checking if you want support for Sun-style function keys... $ECHO_C" >&6 + + # Check whether --enable-sun-fkeys or --disable-sun-fkeys was given. +@@ -10260,7 +10340,7 @@ + enable_sun_fkeys=yes + + fi; +-echo "$as_me:10263: result: $enable_sun_fkeys" >&5 ++echo "$as_me:10343: result: $enable_sun_fkeys" >&5 + echo "${ECHO_T}$enable_sun_fkeys" >&6 + if test "$enable_sun_fkeys" = no ; then + cat >>confdefs.h <<\EOF +@@ -10269,7 +10349,7 @@ + + fi + +-echo "$as_me:10272: checking if you want support for internationalization" >&5 ++echo "$as_me:10352: checking if you want support for internationalization" >&5 + echo $ECHO_N "checking if you want support for internationalization... $ECHO_C" >&6 + + # Check whether --enable-i18n or --disable-i18n was given. +@@ -10286,7 +10366,7 @@ + enable_i18n=yes + + fi; +-echo "$as_me:10289: result: $enable_i18n" >&5 ++echo "$as_me:10369: result: $enable_i18n" >&5 + echo "${ECHO_T}$enable_i18n" >&6 + if test "$enable_i18n" = no ; then + cat >>confdefs.h <<\EOF +@@ -10295,7 +10375,7 @@ + + fi + +-echo "$as_me:10298: checking if you want support for initial-erase setup" >&5 ++echo "$as_me:10378: checking if you want support for initial-erase setup" >&5 + echo $ECHO_N "checking if you want support for initial-erase setup... $ECHO_C" >&6 + + # Check whether --enable-initial-erase or --disable-initial-erase was given. +@@ -10312,7 +10392,7 @@ + enable_ie=yes + + fi; +-echo "$as_me:10315: result: $enable_ie" >&5 ++echo "$as_me:10395: result: $enable_ie" >&5 + echo "${ECHO_T}$enable_ie" >&6 + if test "$enable_ie" = no ; then + cat >>confdefs.h <<\EOF +@@ -10321,7 +10401,7 @@ + + fi + +-echo "$as_me:10324: checking if you want support for input-method" >&5 ++echo "$as_me:10404: checking if you want support for input-method" >&5 + echo $ECHO_N "checking if you want support for input-method... $ECHO_C" >&6 + + # Check whether --enable-input-method or --disable-input-method was given. +@@ -10338,17 +10418,17 @@ + enable_ximp=yes + + fi; +-echo "$as_me:10341: result: $enable_ximp" >&5 ++echo "$as_me:10421: result: $enable_ximp" >&5 + echo "${ECHO_T}$enable_ximp" >&6 + +-echo "$as_me:10344: checking if X libraries support input-method" >&5 ++echo "$as_me:10424: checking if X libraries support input-method" >&5 + echo $ECHO_N "checking if X libraries support input-method... $ECHO_C" >&6 + if test "${cf_cv_input_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 10351 "configure" ++#line 10431 "configure" + #include "confdefs.h" + + #include +@@ -10380,16 +10460,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10383: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10463: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10386: \$? = $ac_status" >&5 ++ echo "$as_me:10466: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10389: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10469: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10392: \$? = $ac_status" >&5 ++ echo "$as_me:10472: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_input_method=yes + else +@@ -10399,7 +10479,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:10402: result: $cf_cv_input_method" >&5 ++echo "$as_me:10482: result: $cf_cv_input_method" >&5 + echo "${ECHO_T}$cf_cv_input_method" >&6 + + test "$cf_cv_input_method" = no && enable_ximp=no +@@ -10410,7 +10490,7 @@ + + fi + +-echo "$as_me:10413: checking if you want support for load-vt-fonts" >&5 ++echo "$as_me:10493: checking if you want support for load-vt-fonts" >&5 + echo $ECHO_N "checking if you want support for load-vt-fonts... $ECHO_C" >&6 + + # Check whether --enable-load-vt-fonts or --disable-load-vt-fonts was given. +@@ -10427,7 +10507,7 @@ + enable_load_vt_fonts=no + + fi; +-echo "$as_me:10430: result: $enable_load_vt_fonts" >&5 ++echo "$as_me:10510: result: $enable_load_vt_fonts" >&5 + echo "${ECHO_T}$enable_load_vt_fonts" >&6 + if test "$enable_load_vt_fonts" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10436,7 +10516,7 @@ + + fi + +-echo "$as_me:10439: checking if you want support for logging" >&5 ++echo "$as_me:10519: checking if you want support for logging" >&5 + echo $ECHO_N "checking if you want support for logging... $ECHO_C" >&6 + + # Check whether --enable-logging or --disable-logging was given. +@@ -10453,14 +10533,14 @@ + enable_logging=no + + fi; +-echo "$as_me:10456: result: $enable_logging" >&5 ++echo "$as_me:10536: result: $enable_logging" >&5 + echo "${ECHO_T}$enable_logging" >&6 + if test "$enable_logging" = yes ; then + cat >>confdefs.h <<\EOF + #define ALLOWLOGGING 1 + EOF + +- echo "$as_me:10463: checking if you want to allow logging via a pipe" >&5 ++ echo "$as_me:10543: checking if you want to allow logging via a pipe" >&5 + echo $ECHO_N "checking if you want to allow logging via a pipe... $ECHO_C" >&6 + + # Check whether --enable-logfile-exec or --disable-logfile-exec was given. +@@ -10477,7 +10557,7 @@ + enable_log_exec=no + + fi; +- echo "$as_me:10480: result: $enable_log_exec" >&5 ++ echo "$as_me:10560: result: $enable_log_exec" >&5 + echo "${ECHO_T}$enable_log_exec" >&6 + if test "$enable_log_exec" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10487,7 +10567,7 @@ + fi + fi + +-echo "$as_me:10490: checking if you want support for iconify/maximize translations" >&5 ++echo "$as_me:10570: checking if you want support for iconify/maximize translations" >&5 + echo $ECHO_N "checking if you want support for iconify/maximize translations... $ECHO_C" >&6 + + # Check whether --enable-maximize or --disable-maximize was given. +@@ -10504,13 +10584,13 @@ + enable_maximize=yes + + fi; +-echo "$as_me:10507: result: $enable_maximize" >&5 ++echo "$as_me:10587: result: $enable_maximize" >&5 + echo "${ECHO_T}$enable_maximize" >&6 + test "$enable_maximize" = no && cat >>confdefs.h <<\EOF + #define OPT_MAXIMIZE 0 + EOF + +-echo "$as_me:10513: checking if you want NumLock to override keyboard tables" >&5 ++echo "$as_me:10593: checking if you want NumLock to override keyboard tables" >&5 + echo $ECHO_N "checking if you want NumLock to override keyboard tables... $ECHO_C" >&6 + + # Check whether --enable-num-lock or --disable-num-lock was given. +@@ -10527,13 +10607,13 @@ + enable_numlock=yes + + fi; +-echo "$as_me:10530: result: $enable_numlock" >&5 ++echo "$as_me:10610: result: $enable_numlock" >&5 + echo "${ECHO_T}$enable_numlock" >&6 + test "$enable_numlock" = no && cat >>confdefs.h <<\EOF + #define OPT_NUM_LOCK 0 + EOF + +-echo "$as_me:10536: checking if you want support for get/set of base64 selection data" >&5 ++echo "$as_me:10616: checking if you want support for get/set of base64 selection data" >&5 + echo $ECHO_N "checking if you want support for get/set of base64 selection data... $ECHO_C" >&6 + + # Check whether --enable-paste64 or --disable-paste64 was given. +@@ -10550,7 +10630,7 @@ + enable_paste64=no + + fi; +-echo "$as_me:10553: result: $enable_paste64" >&5 ++echo "$as_me:10633: result: $enable_paste64" >&5 + echo "${ECHO_T}$enable_paste64" >&6 + if test "$enable_paste64" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10564,7 +10644,7 @@ + + fi + +-echo "$as_me:10567: checking if you want support for pty-handshaking" >&5 ++echo "$as_me:10647: checking if you want support for pty-handshaking" >&5 + echo $ECHO_N "checking if you want support for pty-handshaking... $ECHO_C" >&6 + + # Check whether --enable-pty-handshake or --disable-pty-handshake was given. +@@ -10581,7 +10661,7 @@ + enable_pty_handshake=yes + + fi; +-echo "$as_me:10584: result: $enable_pty_handshake" >&5 ++echo "$as_me:10664: result: $enable_pty_handshake" >&5 + echo "${ECHO_T}$enable_pty_handshake" >&6 + if test "$enable_pty_handshake" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10595,7 +10675,7 @@ + + fi + +-echo "$as_me:10598: checking if you want support for mouse in readline applications" >&5 ++echo "$as_me:10678: checking if you want support for mouse in readline applications" >&5 + echo $ECHO_N "checking if you want support for mouse in readline applications... $ECHO_C" >&6 + + # Check whether --enable-readline-mouse or --disable-readline-mouse was given. +@@ -10612,7 +10692,7 @@ + enable_readline_mouse=no + + fi; +-echo "$as_me:10615: result: $enable_readline_mouse" >&5 ++echo "$as_me:10695: result: $enable_readline_mouse" >&5 + echo "${ECHO_T}$enable_readline_mouse" >&6 + if test "$enable_readline_mouse" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10621,7 +10701,7 @@ + + fi + +-echo "$as_me:10624: checking if you want support for regular-expression selections" >&5 ++echo "$as_me:10704: checking if you want support for regular-expression selections" >&5 + echo $ECHO_N "checking if you want support for regular-expression selections... $ECHO_C" >&6 + + # Check whether --enable-regex or --disable-regex was given. +@@ -10638,11 +10718,11 @@ + enable_regex=yes + + fi; +-echo "$as_me:10641: result: $enable_regex" >&5 ++echo "$as_me:10721: result: $enable_regex" >&5 + echo "${ECHO_T}$enable_regex" >&6 + if test "$enable_regex" = yes ; then + +-echo "$as_me:10645: checking if you want to use PCRE for regular-expressions" >&5 ++echo "$as_me:10725: checking if you want to use PCRE for regular-expressions" >&5 + echo $ECHO_N "checking if you want to use PCRE for regular-expressions... $ECHO_C" >&6 + + # Check whether --with-pcre or --without-pcre was given. +@@ -10651,11 +10731,11 @@ + + fi; + test -z "$with_pcre" && with_pcre=no +-echo "$as_me:10654: result: $with_pcre" >&5 ++echo "$as_me:10734: result: $with_pcre" >&5 + echo "${ECHO_T}$with_pcre" >&6 + + if test "$with_pcre" != no ; then +- echo "$as_me:10658: checking for pcre_compile in -lpcre" >&5 ++ echo "$as_me:10738: checking for pcre_compile in -lpcre" >&5 + echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6 + if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10663,7 +10743,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcre $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10666 "configure" ++#line 10746 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10682,16 +10762,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10685: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10765: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10688: \$? = $ac_status" >&5 ++ echo "$as_me:10768: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10691: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10771: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10694: \$? = $ac_status" >&5 ++ echo "$as_me:10774: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcre_pcre_compile=yes + else +@@ -10702,26 +10782,26 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10705: result: $ac_cv_lib_pcre_pcre_compile" >&5 ++echo "$as_me:10785: result: $ac_cv_lib_pcre_pcre_compile" >&5 + echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6 + if test $ac_cv_lib_pcre_pcre_compile = yes; then +- echo "$as_me:10708: checking for pcreposix.h" >&5 ++ echo "$as_me:10788: checking for pcreposix.h" >&5 + echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6 + if test "${ac_cv_header_pcreposix_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10714 "configure" ++#line 10794 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:10718: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:10798: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:10724: \$? = $ac_status" >&5 ++ echo "$as_me:10804: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10740,10 +10820,10 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:10743: result: $ac_cv_header_pcreposix_h" >&5 ++echo "$as_me:10823: result: $ac_cv_header_pcreposix_h" >&5 + echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6 + if test $ac_cv_header_pcreposix_h = yes; then +- echo "$as_me:10746: checking for pcreposix_regcomp in -lpcreposix" >&5 ++ echo "$as_me:10826: checking for pcreposix_regcomp in -lpcreposix" >&5 + echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6 + if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10751,7 +10831,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcreposix "-lpcre" $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10754 "configure" ++#line 10834 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10770,16 +10850,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10773: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10853: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10776: \$? = $ac_status" >&5 ++ echo "$as_me:10856: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10779: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10859: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10782: \$? = $ac_status" >&5 ++ echo "$as_me:10862: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcreposix_pcreposix_regcomp=yes + else +@@ -10790,7 +10870,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10793: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 ++echo "$as_me:10873: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_pcreposix_pcreposix_regcomp" >&6 + if test $ac_cv_lib_pcreposix_pcreposix_regcomp = yes; then + cat >>confdefs.h <<\EOF +@@ -10803,19 +10883,19 @@ + + LIBS="-lpcreposix -lpcre $LIBS" + else +- { { echo "$as_me:10806: error: Cannot find PCRE POSIX library" >&5 ++ { { echo "$as_me:10886: error: Cannot find PCRE POSIX library" >&5 + echo "$as_me: error: Cannot find PCRE POSIX library" >&2;} + { (exit 1); exit 1; }; } + fi + + else +- { { echo "$as_me:10812: error: Cannot find PCRE POSIX header" >&5 ++ { { echo "$as_me:10892: error: Cannot find PCRE POSIX header" >&5 + echo "$as_me: error: Cannot find PCRE POSIX header" >&2;} + { (exit 1); exit 1; }; } + fi + + else +- { { echo "$as_me:10818: error: Cannot find PCRE library" >&5 ++ { { echo "$as_me:10898: error: Cannot find PCRE library" >&5 + echo "$as_me: error: Cannot find PCRE library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10824,14 +10904,14 @@ + + if test "$with_pcre" = no ; then + +-echo "$as_me:10827: checking for regular-expression headers" >&5 ++echo "$as_me:10907: checking for regular-expression headers" >&5 + echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 + if test "${cf_cv_regex+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 10834 "configure" ++#line 10914 "configure" + #include "confdefs.h" + #include + #include +@@ -10849,16 +10929,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10852: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10932: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10855: \$? = $ac_status" >&5 ++ echo "$as_me:10935: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10858: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10938: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10861: \$? = $ac_status" >&5 ++ echo "$as_me:10941: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_regex="regex.h" + else +@@ -10866,7 +10946,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 10869 "configure" ++#line 10949 "configure" + #include "confdefs.h" + #include + int +@@ -10881,16 +10961,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10884: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10964: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10887: \$? = $ac_status" >&5 ++ echo "$as_me:10967: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10890: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10970: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10893: \$? = $ac_status" >&5 ++ echo "$as_me:10973: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_regex="regexp.h" + else +@@ -10900,7 +10980,7 @@ + cf_save_LIBS="$LIBS" + LIBS="-lgen $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10903 "configure" ++#line 10983 "configure" + #include "confdefs.h" + #include + int +@@ -10915,16 +10995,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10918: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10998: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10921: \$? = $ac_status" >&5 ++ echo "$as_me:11001: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10927: \$? = $ac_status" >&5 ++ echo "$as_me:11007: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_regex="regexpr.h" + else +@@ -10940,7 +11020,7 @@ + + fi + +-echo "$as_me:10943: result: $cf_cv_regex" >&5 ++echo "$as_me:11023: result: $cf_cv_regex" >&5 + echo "${ECHO_T}$cf_cv_regex" >&6 + case $cf_cv_regex in + regex.h) cat >>confdefs.h <<\EOF +@@ -10958,7 +11038,7 @@ + esac + + if test "X$cf_cv_regex" != "Xregex.h" ; then +- { { echo "$as_me:10961: error: Only POSIX or PCRE regular expressions are supported" >&5 ++ { { echo "$as_me:11041: error: Only POSIX or PCRE regular expressions are supported" >&5 + echo "$as_me: error: Only POSIX or PCRE regular expressions are supported" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10969,7 +11049,7 @@ + + fi + +-echo "$as_me:10972: checking if you want support for right-scrollbar" >&5 ++echo "$as_me:11052: checking if you want support for right-scrollbar" >&5 + echo $ECHO_N "checking if you want support for right-scrollbar... $ECHO_C" >&6 + + # Check whether --enable-rightbar or --disable-rightbar was given. +@@ -10986,7 +11066,7 @@ + enable_rightbar=yes + + fi; +-echo "$as_me:10989: result: $enable_rightbar" >&5 ++echo "$as_me:11069: result: $enable_rightbar" >&5 + echo "${ECHO_T}$enable_rightbar" >&6 + if test "$enable_rightbar" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10995,7 +11075,7 @@ + + fi + +-echo "$as_me:10998: checking if you want check for redundant name-change" >&5 ++echo "$as_me:11078: checking if you want check for redundant name-change" >&5 + echo $ECHO_N "checking if you want check for redundant name-change... $ECHO_C" >&6 + + # Check whether --enable-samename or --disable-samename was given. +@@ -11012,13 +11092,13 @@ + enable_samename=yes + + fi; +-echo "$as_me:11015: result: $enable_samename" >&5 ++echo "$as_me:11095: result: $enable_samename" >&5 + echo "${ECHO_T}$enable_samename" >&6 + test "$enable_samename" = no && cat >>confdefs.h <<\EOF + #define OPT_SAME_NAME 0 + EOF + +-echo "$as_me:11021: checking if you want support for session management" >&5 ++echo "$as_me:11101: checking if you want support for session management" >&5 + echo $ECHO_N "checking if you want support for session management... $ECHO_C" >&6 + + # Check whether --enable-session-mgt or --disable-session-mgt was given. +@@ -11035,13 +11115,13 @@ + enable_session_mgt=yes + + fi; +-echo "$as_me:11038: result: $enable_session_mgt" >&5 ++echo "$as_me:11118: result: $enable_session_mgt" >&5 + echo "${ECHO_T}$enable_session_mgt" >&6 + test "$enable_session_mgt" = no && cat >>confdefs.h <<\EOF + #define OPT_SESSION_MGT 0 + EOF + +-echo "$as_me:11044: checking if you want to use termcap-query/report" >&5 ++echo "$as_me:11124: checking if you want to use termcap-query/report" >&5 + echo $ECHO_N "checking if you want to use termcap-query/report... $ECHO_C" >&6 + + # Check whether --enable-tcap-query or --disable-tcap-query was given. +@@ -11058,13 +11138,13 @@ + enable_tcap_query=no + + fi; +-echo "$as_me:11061: result: $enable_tcap_query" >&5 ++echo "$as_me:11141: result: $enable_tcap_query" >&5 + echo "${ECHO_T}$enable_tcap_query" >&6 + test "$enable_tcap_query" = yes && cat >>confdefs.h <<\EOF + #define OPT_TCAP_QUERY 1 + EOF + +-echo "$as_me:11067: checking if you want support for tek4014" >&5 ++echo "$as_me:11147: checking if you want support for tek4014" >&5 + echo $ECHO_N "checking if you want support for tek4014... $ECHO_C" >&6 + + # Check whether --enable-tek4014 or --disable-tek4014 was given. +@@ -11081,7 +11161,7 @@ + enable_tek4014=yes + + fi; +-echo "$as_me:11084: result: $enable_tek4014" >&5 ++echo "$as_me:11164: result: $enable_tek4014" >&5 + echo "${ECHO_T}$enable_tek4014" >&6 + if test "$enable_tek4014" = no ; then + cat >>confdefs.h <<\EOF +@@ -11094,7 +11174,7 @@ + EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o" + fi + +-echo "$as_me:11097: checking if you want pulldown menus with a toolbar" >&5 ++echo "$as_me:11177: checking if you want pulldown menus with a toolbar" >&5 + echo $ECHO_N "checking if you want pulldown menus with a toolbar... $ECHO_C" >&6 + + # Check whether --enable-toolbar or --disable-toolbar was given. +@@ -11111,7 +11191,7 @@ + enable_toolbar=no + + fi; +-echo "$as_me:11114: result: $enable_toolbar" >&5 ++echo "$as_me:11194: result: $enable_toolbar" >&5 + echo "${ECHO_T}$enable_toolbar" >&6 + if test "$enable_toolbar" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11120,7 +11200,7 @@ + + fi + +-echo "$as_me:11123: checking if you want VT52 emulation" >&5 ++echo "$as_me:11203: checking if you want VT52 emulation" >&5 + echo $ECHO_N "checking if you want VT52 emulation... $ECHO_C" >&6 + + # Check whether --enable-vt52 or --disable-vt52 was given. +@@ -11137,13 +11217,13 @@ + enable_vt52=yes + + fi; +-echo "$as_me:11140: result: $enable_vt52" >&5 ++echo "$as_me:11220: result: $enable_vt52" >&5 + echo "${ECHO_T}$enable_vt52" >&6 + test "$enable_vt52" = no && cat >>confdefs.h <<\EOF + #define OPT_VT52_MODE 0 + EOF + +-echo "$as_me:11146: checking if you want to use mini-luit/Latin9 built-in support" >&5 ++echo "$as_me:11226: checking if you want to use mini-luit/Latin9 built-in support" >&5 + echo $ECHO_N "checking if you want to use mini-luit/Latin9 built-in support... $ECHO_C" >&6 + + # Check whether --enable-mini-luit or --disable-mini-luit was given. +@@ -11160,7 +11240,7 @@ + enable_mini_luit=no + + fi; +-echo "$as_me:11163: result: $enable_mini_luit" >&5 ++echo "$as_me:11243: result: $enable_mini_luit" >&5 + echo "${ECHO_T}$enable_mini_luit" >&6 + if test "$enable_mini_luit" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11169,7 +11249,7 @@ + + fi + +-echo "$as_me:11172: checking if you want to use luit" >&5 ++echo "$as_me:11252: checking if you want to use luit" >&5 + echo $ECHO_N "checking if you want to use luit... $ECHO_C" >&6 + + # Check whether --enable-luit or --disable-luit was given. +@@ -11186,7 +11266,7 @@ + enable_luit=$enable_mini_luit + + fi; +-echo "$as_me:11189: result: $enable_luit" >&5 ++echo "$as_me:11269: result: $enable_luit" >&5 + echo "${ECHO_T}$enable_luit" >&6 + if test "$enable_luit" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11198,7 +11278,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:11201: checking for $ac_word" >&5 ++echo "$as_me:11281: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_LUIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11215,7 +11295,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_LUIT="$ac_dir/$ac_word" +- echo "$as_me:11218: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:11298: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -11226,10 +11306,10 @@ + LUIT=$ac_cv_path_LUIT + + if test -n "$LUIT"; then +- echo "$as_me:11229: result: $LUIT" >&5 ++ echo "$as_me:11309: result: $LUIT" >&5 + echo "${ECHO_T}$LUIT" >&6 + else +- echo "$as_me:11232: result: no" >&5 ++ echo "$as_me:11312: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -11297,7 +11377,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "(line 11300) testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "(line 11380) testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:11394: checking if you want wide-character support" >&5 + echo $ECHO_N "checking if you want wide-character support... $ECHO_C" >&6 + + # Check whether --enable-wide-chars or --disable-wide-chars was given. +@@ -11328,7 +11408,7 @@ + enable_wchar=$enable_luit + + fi; +-echo "$as_me:11331: result: $enable_wchar" >&5 ++echo "$as_me:11411: result: $enable_wchar" >&5 + echo "${ECHO_T}$enable_wchar" >&6 + if test "$enable_wchar" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11340,7 +11420,7 @@ + EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o" + fi + +-echo "$as_me:11343: checking if you want dynamic-abbreviation support" >&5 ++echo "$as_me:11423: checking if you want dynamic-abbreviation support" >&5 + echo $ECHO_N "checking if you want dynamic-abbreviation support... $ECHO_C" >&6 + + # Check whether --enable-dabbrev or --disable-dabbrev was given. +@@ -11357,7 +11437,7 @@ + enable_dabbrev=no + + fi; +-echo "$as_me:11360: result: $enable_dabbrev" >&5 ++echo "$as_me:11440: result: $enable_dabbrev" >&5 + echo "${ECHO_T}$enable_dabbrev" >&6 + if test "$enable_dabbrev" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11366,7 +11446,7 @@ + + fi + +-echo "$as_me:11369: checking if you want DECterm Locator support" >&5 ++echo "$as_me:11449: checking if you want DECterm Locator support" >&5 + echo $ECHO_N "checking if you want DECterm Locator support... $ECHO_C" >&6 + + # Check whether --enable-dec-locator or --disable-dec-locator was given. +@@ -11383,7 +11463,7 @@ + enable_dec_locator=no + + fi; +-echo "$as_me:11386: result: $enable_dec_locator" >&5 ++echo "$as_me:11466: result: $enable_dec_locator" >&5 + echo "${ECHO_T}$enable_dec_locator" >&6 + if test "$enable_dec_locator" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11392,7 +11472,7 @@ + + fi + +-echo "$as_me:11395: checking if you want VT420 rectangle support" >&5 ++echo "$as_me:11475: checking if you want VT420 rectangle support" >&5 + echo $ECHO_N "checking if you want VT420 rectangle support... $ECHO_C" >&6 + + # Check whether --enable-rectangles or --disable-rectangles was given. +@@ -11409,7 +11489,7 @@ + enable_rectangles=no + + fi; +-echo "$as_me:11412: result: $enable_rectangles" >&5 ++echo "$as_me:11492: result: $enable_rectangles" >&5 + echo "${ECHO_T}$enable_rectangles" >&6 + if test "$enable_rectangles" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11418,7 +11498,7 @@ + + fi + +-echo "$as_me:11421: checking if you want -ziconbeep option" >&5 ++echo "$as_me:11501: checking if you want -ziconbeep option" >&5 + echo $ECHO_N "checking if you want -ziconbeep option... $ECHO_C" >&6 + + # Check whether --enable-ziconbeep or --disable-ziconbeep was given. +@@ -11435,7 +11515,7 @@ + enable_ziconbeep=yes + + fi; +-echo "$as_me:11438: result: $enable_ziconbeep" >&5 ++echo "$as_me:11518: result: $enable_ziconbeep" >&5 + echo "${ECHO_T}$enable_ziconbeep" >&6 + test "$enable_ziconbeep" = no && cat >>confdefs.h <<\EOF + #define OPT_ZICONBEEP 0 +@@ -11443,7 +11523,7 @@ + + ############################################################################### + +-echo "$as_me:11446: checking if you want debugging traces" >&5 ++echo "$as_me:11526: checking if you want debugging traces" >&5 + echo $ECHO_N "checking if you want debugging traces... $ECHO_C" >&6 + + # Check whether --enable-trace or --disable-trace was given. +@@ -11460,7 +11540,7 @@ + enable_trace=no + + fi; +-echo "$as_me:11463: result: $enable_trace" >&5 ++echo "$as_me:11543: result: $enable_trace" >&5 + echo "${ECHO_T}$enable_trace" >&6 + if test "$enable_trace" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11471,7 +11551,7 @@ + EXTRAOBJS="$EXTRAOBJS trace.o" + fi + +-echo "$as_me:11474: checking if you want to test memory leaks" >&5 ++echo "$as_me:11554: checking if you want to test memory leaks" >&5 + echo $ECHO_N "checking if you want to test memory leaks... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -11488,7 +11568,7 @@ + disable_leaks=no + + fi; +-echo "$as_me:11491: result: $disable_leaks" >&5 ++echo "$as_me:11571: result: $disable_leaks" >&5 + echo "${ECHO_T}$disable_leaks" >&6 + if test "$disable_leaks" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11497,7 +11577,7 @@ + + fi + +-echo "$as_me:11500: checking if you want to see long compiling messages" >&5 ++echo "$as_me:11580: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -11531,10 +11611,10 @@ + ECHO_CC='' + + fi; +-echo "$as_me:11534: result: $enableval" >&5 ++echo "$as_me:11614: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:11537: checking if you want magic cookie emulation" >&5 ++echo "$as_me:11617: checking if you want magic cookie emulation" >&5 + echo $ECHO_N "checking if you want magic cookie emulation... $ECHO_C" >&6 + + # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. +@@ -11551,7 +11631,7 @@ + enable_xmc=no + + fi; +-echo "$as_me:11554: result: $enable_xmc" >&5 ++echo "$as_me:11634: result: $enable_xmc" >&5 + echo "${ECHO_T}$enable_xmc" >&6 + if test "$enable_xmc" = yes ; then + cat >>confdefs.h <<\EOF +@@ -11563,7 +11643,7 @@ + fi + + if test -n "$GCC" ; then +-echo "$as_me:11566: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:11646: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -11580,7 +11660,7 @@ + with_warnings=no + + fi; +-echo "$as_me:11583: result: $with_warnings" >&5 ++echo "$as_me:11663: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + if test "$with_warnings" = yes + then +@@ -11603,10 +11683,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:11606: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:11686: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:11727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11650: \$? = $ac_status" >&5 ++ echo "$as_me:11730: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11652: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:11732: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + fi +@@ -11662,11 +11742,11 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:11665: checking version of $CC" >&5 ++ echo "$as_me:11745: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown +- echo "$as_me:11669: result: $GCC_VERSION" >&5 ++ echo "$as_me:11749: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +@@ -11675,12 +11755,12 @@ + if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) +- echo "$as_me:11678: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:11758: checking if this is really Intel C compiler" >&5 + echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +-#line 11683 "configure" ++#line 11763 "configure" + #include "confdefs.h" + + int +@@ -11697,16 +11777,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11700: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11780: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11703: \$? = $ac_status" >&5 ++ echo "$as_me:11783: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11706: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11786: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11709: \$? = $ac_status" >&5 ++ echo "$as_me:11789: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +@@ -11717,14 +11797,14 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:11720: result: $INTEL_COMPILER" >&5 ++ echo "$as_me:11800: result: $INTEL_COMPILER" >&5 + echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac + fi + + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:11825: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -11759,12 +11839,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:11762: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:11842: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11765: \$? = $ac_status" >&5 ++ echo "$as_me:11845: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11767: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:11847: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -11773,7 +11853,7 @@ + + elif test "$GCC" = yes + then +- { echo "$as_me:11776: checking for $CC warning options..." >&5 ++ { echo "$as_me:11856: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-W -Wall" +@@ -11793,12 +11873,12 @@ + Wundef $cf_warn_CONST + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:11796: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:11876: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11799: \$? = $ac_status" >&5 ++ echo "$as_me:11879: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11801: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:11881: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in #(vi + Wcast-qual) #(vi +@@ -11823,13 +11903,20 @@ + fi + fi + +-if test $disable_setuid = yes ; then +- MAY_SETUID="#" +- NOT_SETUID= +- cat >>confdefs.h <<\EOF ++test "$disable_setuid" = yes && cat >>confdefs.h <<\EOF + #define DISABLE_SETUID 1 + EOF + ++test "$disable_setgid" = yes && cat >>confdefs.h <<\EOF ++#define DISABLE_SETGID 1 ++EOF ++ ++if test $disable_setuid = yes ; then ++ MAY_SETUID="#" ++ NOT_SETUID= ++elif test $disable_setgid = yes ; then ++ MAY_SETUID="#" ++ NOT_SETUID= + else + MAY_SETUID= + NOT_SETUID="#" +@@ -11932,7 +12019,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:11935: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:12022: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -12105,7 +12192,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:12108: error: ambiguous option: $1 ++ { { echo "$as_me:12195: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -12124,7 +12211,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:12127: error: unrecognized option: $1 ++ -*) { { echo "$as_me:12214: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -12161,7 +12248,7 @@ + # Handling of arguments. + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;; +- *) { { echo "$as_me:12164: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:12251: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -12413,7 +12500,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:12416: creating $ac_file" >&5 ++ { echo "$as_me:12503: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -12431,7 +12518,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:12434: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:12521: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -12444,7 +12531,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:12447: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:12534: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -12510,7 +12597,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:12513: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:12600: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -12521,7 +12608,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:12524: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:12611: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -12534,7 +12621,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:12537: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:12624: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -12652,7 +12739,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then +- { echo "$as_me:12655: $ac_file is unchanged" >&5 ++ { echo "$as_me:12742: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: configure.in +--- xterm-224+/configure.in 2006-11-30 23:54:26.000000000 +0000 ++++ xterm-224i/configure.in 2007-03-11 18:22:46.000000000 +0000 +@@ -1,10 +1,10 @@ +-dnl $XTermId: configure.in,v 1.221 2006/11/30 23:54:26 tom Exp $ ++dnl $XTermId: configure.in,v 1.224 2007/03/11 18:22:46 tom Exp $ + dnl + dnl $XFree86: xc/programs/xterm/configure.in,v 3.77 2006/06/19 00:36:51 dickey Exp $ + dnl + dnl --------------------------------------------------------------------------- + dnl +-dnl Copyright 1997-2005,2006 by Thomas E. Dickey ++dnl Copyright 1997-2006,2007 by Thomas E. Dickey + dnl + dnl All Rights Reserved + dnl +@@ -155,12 +155,20 @@ + + AC_MSG_CHECKING(if you want to disable setuid) + CF_ARG_DISABLE(setuid, +- [ --disable-setuid disable setuid in xterm, do not install setuid], ++ [ --disable-setuid disable setuid in xterm, do not install setuid/setgid], + [disable_setuid=yes], + [disable_setuid=no], + no) + AC_MSG_RESULT($disable_setuid) + ++AC_MSG_CHECKING(if you want to disable setgid) ++CF_ARG_DISABLE(setgid, ++ [ --disable-setgid disable setgid in xterm, do not install setuid/setgid], ++ [disable_setgid=yes], ++ [disable_setgid=no], ++ no) ++AC_MSG_RESULT($disable_setuid) ++ + AC_MSG_CHECKING(if you want to run xterm setuid to a given user) + AC_ARG_WITH(setuid, + [ --with-setuid=XXX use the given setuid user], +@@ -459,6 +467,22 @@ + AC_MSG_RESULT($enable_boxchars) + test "$enable_boxchars" = no && AC_DEFINE(OPT_BOX_CHARS,0) + ++AC_MSG_CHECKING(if you want to allow spawning new xterms) ++CF_ARG_ENABLE(exec-xterm, ++ [ --enable-exec-xterm enable "spawn-new-terminal" action], ++ [enable_exec_xterm=yes], ++ [enable_exec_xterm=no]) ++AC_MSG_RESULT($enable_exec_xterm) ++if test "$enable_exec_xterm" = yes ; then ++ CF_PROCFS_CWD ++ if test "$cf_cv_procfs_cwd" = no ; then ++ AC_MSG_WARN(no suitable proc filesystem found) ++ else ++ AC_DEFINE_UNQUOTED(PROCFS_ROOT,"$cf_cv_procfs_cwd") ++ AC_DEFINE(OPT_EXEC_XTERM) ++ fi ++fi ++ + AC_MSG_CHECKING(if you want to use FreeType library) + CF_ARG_DISABLE(freetype, + [ --disable-freetype disable freetype library-support], +@@ -829,10 +853,15 @@ + AC_SUBST(EXTRASRCS) + AC_SUBST(EXTRAOBJS) + ++test "$disable_setuid" = yes && AC_DEFINE(DISABLE_SETUID) ++test "$disable_setgid" = yes && AC_DEFINE(DISABLE_SETGID) ++ + if test $disable_setuid = yes ; then + MAY_SETUID="#" + NOT_SETUID= +- AC_DEFINE(DISABLE_SETUID) ++elif test $disable_setgid = yes ; then ++ MAY_SETUID="#" ++ NOT_SETUID= + else + MAY_SETUID= + NOT_SETUID="#" +Index: ctlseqs.ms +--- xterm-224+/ctlseqs.ms 2007-02-07 22:16:51.000000000 +0000 ++++ xterm-224i/ctlseqs.ms 2007-03-14 23:25:52.000000000 +0000 +@@ -1,6 +1,6 @@ + .\"#! troff -ms $1 -*- Nroff -*- + .\" "Xterm Control Sequences" document +-.\" $XTermId: ctlseqs.ms,v 1.173 2007/02/07 22:16:51 tom Exp $ ++.\" $XTermId: ctlseqs.ms,v 1.179 2007/03/14 23:25:52 tom Exp $ + .\" + .\" + .\" $XFree86: xc/doc/specs/xterm/ctlseqs.ms,v 3.60 2006/03/13 01:27:53 dickey Exp $ +@@ -75,7 +75,7 @@ + .de St + .sp + .nr PD 0 +-.nr PI 1.5i ++.nr PI 1.0i + .nr VS 16 + .. + .de Ed +@@ -1294,6 +1294,63 @@ + .Ed + . + .SH ++Alt and Meta Keys ++.LP ++Many keyboards have keys labeled "Alt". ++Few have keys labeled "Meta". ++However, \fIxterm\fP's default translations use the \fIMeta\fP modifier. ++Common keyboard configurations assign the \fIMeta\fP modifier to an "Alt" key. ++By using \fIxmodmap\fP one may have the modifier assigned to a different key, ++and have "real" alt and meta keys. ++Here is an example: ++.DS B ++! put meta on mod3 to distinguish it from alt ++keycode 64 = Alt_L ++clear mod1 ++add mod1 = Alt_L ++keycode 115 = Meta_L ++clear mod3 ++add mod3 = Meta_L ++.DE ++.LP ++The \fBmetaSendsEscape\fP and \fBeightBitInput\fP resources ++are used to control the way the \fIMeta\fP modifier applies to ordinary ++keys unless the \fBmodifyOtherKeys\fP resource is set: ++.IP ++- ++prefix a key with the \*(Es character. ++.IP ++- ++shift the key from codes 0-127 to 128-255 by adding 128. ++.LP ++The table shows the result for a given character "x" with modifiers ++according to the default translations with the resources set on or off: ++.TS ++center; ++lf3 lf3 lf3 lf3 ++lf3w(2c) lf3w(2c) lf3w(2c) lf3w(2c) . ++_ ++key metaSendsEscape eightBitInput result ++_ ++x off off x ++x off ON x ++x ON off x ++x ON ON x ++Alt-x off off \*(Es x ++Alt-x off ON shift ++Alt-x ON off \*(Es x ++Alt-x ON ON shift ++Meta-x off off x ++Meta-x off ON x ++Meta-x ON off \*(Es x ++Meta-x ON ON \*(Es x ++Alt+Meta-x off off x ++Alt+Meta-x off ON shift ++Alt+Meta-x ON off \*(Es x ++Alt+Meta-x ON ON \*(Es x ++_ ++.TE ++.SH + PC-Style Function Keys + .ds RH Function Keys + .LP +@@ -1656,6 +1713,8 @@ + #define SET_VT200_HIGHLIGHT_MOUSE 1001 + #define SET_BTN_EVENT_MOUSE 1002 + #define SET_ANY_EVENT_MOUSE 1003 ++ ++#define SET_FOCUS_EVENT_MOUSE 1004 + .DE + .LP + The motion reporting modes are strictly \fIxterm\fP extensions, and are not +@@ -1751,6 +1810,12 @@ + Any-event mode is the same as button-event mode, except that all motion + events are reported, even if no mouse button is down. + It is enabled by specifying 1003 to DECSET. ++ ++FocusIn/FocusOut can be combined with any of the mouse events since ++it uses a different protocol. ++When set, it causes \fIxterm\fP to send ++\*(Cs\*I when the terminal gains focus, and ++\*(Cs\*O when it loses focus. + . + .br + .ds RH Tektronix 4014 Mode +Index: ctlseqs.txt +--- xterm-224+/ctlseqs.txt 2006-08-02 21:48:27.000000000 +0000 ++++ xterm-224i/ctlseqs.txt 2007-03-14 20:38:47.000000000 +0000 +@@ -19,6 +19,7 @@ + + Thomas Dickey + XFree86 Project (1996-2006) ++ invisible-island.net (2006-2007) + + + +@@ -271,10 +272,10 @@ + where Pp denotes the terminal type + -> 0 (``VT100'') + -> 1 (``VT220'') +- and Pv is the firmware version (for xterm, this is the +- XFree86 patch number, starting with 95). In a DEC termi- +- nal, Pc indicates the ROM cartridge registration number +- and is always zero. ++ and Pv is the firmware version (for xterm, this was orig- ++ inally the XFree86 patch number, starting with 95). In a ++ DEC terminal, Pc indicates the ROM cartridge registration ++ number and is always zero. + CSI Pm d Line Position Absolute [row] (default = [1,column]) + (VPA) + CSI Ps ; Ps f Horizontal and Vertical Position [row;column] (default = +@@ -324,6 +325,7 @@ + Ps = 1 0 0 1 -> Use Hilite Mouse Tracking. + Ps = 1 0 0 2 -> Use Cell Motion Mouse Tracking. + Ps = 1 0 0 3 -> Use All Motion Mouse Tracking. ++ Ps = 1 0 0 4 -> Send FocusIn/FocusOut events. + Ps = 1 0 1 0 -> Scroll to bottom on tty output (rxvt). + Ps = 1 0 1 1 -> Scroll to bottom on key press (rxvt). + Ps = 1 0 3 4 -> Interpret "meta" key, sets eighth bit. +@@ -373,7 +375,7 @@ + Ps = 6 -> Normal Cursor Mode (DECOM) + Ps = 7 -> No Wraparound Mode (DECAWM) + Ps = 8 -> No Auto-repeat Keys (DECARM) +- Ps = 9 -> Don't Send Mouse X & Y on button press ++ Ps = 9 -> Don't send Mouse X & Y on button press + Ps = 1 0 -> Hide toolbar (rxvt) + Ps = 1 2 -> Stop Blinking Cursor (att610) + Ps = 1 8 -> Don't print form feed (DECPFF) +@@ -392,11 +394,12 @@ + Ps = 4 7 -> Use Normal Screen Buffer + Ps = 6 6 -> Numeric keypad (DECNKM) + Ps = 6 7 -> Backarrow key sends delete (DECBKM) +- Ps = 1 0 0 0 -> Don't Send Mouse X & Y on button press ++ Ps = 1 0 0 0 -> Don't send Mouse X & Y on button press + and release. See the section Mouse Tracking. +- Ps = 1 0 0 1 -> Don't Use Hilite Mouse Tracking +- Ps = 1 0 0 2 -> Don't Use Cell Motion Mouse Tracking +- Ps = 1 0 0 3 -> Don't Use All Motion Mouse Tracking ++ Ps = 1 0 0 1 -> Don't use Hilite Mouse Tracking. ++ Ps = 1 0 0 2 -> Don't use Cell Motion Mouse Tracking. ++ Ps = 1 0 0 3 -> Don't use All Motion Mouse Tracking. ++ Ps = 1 0 0 4 -> Don't send FocusIn/FocusOut events. + Ps = 1 0 1 0 -> Don't scroll to bottom on tty output + (rxvt). + Ps = 1 0 1 1 -> Don't scroll to bottom on key press +@@ -1082,6 +1085,8 @@ + #define SET_BTN_EVENT_MOUSE 1002 + #define SET_ANY_EVENT_MOUSE 1003 + ++ #define SET_FOCUS_EVENT_MOUSE 1004 ++ + The motion reporting modes are strictly xterm extensions, and are not + part of any standard, though they are analogous to the DEC VT200 DECELR + locator reports. +@@ -1156,6 +1161,10 @@ + events are reported, even if no mouse button is down. It is enabled by + specifying 1003 to DECSET. + ++FocusIn/FocusOut can be combined with any of the mouse events since it ++uses a different protocol. When set, it causes xterm to send CSI I ++when the terminal gains focus, and CSI O when it loses focus. ++ + Tektronix 4014 Mode + Most of these sequences are standard Tektronix 4014 control sequences. + Graph mode supports the 12-bit addressing of the Tektronix 4014. The +Index: doit +--- /dev/null 2007-03-14 18:59:32.580524750 +0000 ++++ xterm-224i/doit 2007-03-13 23:54:33.000000000 +0000 +@@ -0,0 +1,2 @@ ++#!/bin/sh ++make && ./xterm +ai +bc -b 30 -T xxxxx -e vile -h +Index: doublechr.c +--- xterm-224+/doublechr.c 2007-02-11 14:49:56.000000000 +0000 ++++ xterm-224i/doublechr.c 2007-03-12 23:44:08.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: doublechr.c,v 1.53 2007/02/11 14:49:56 tom Exp $ */ ++/* $XTermId: doublechr.c,v 1.54 2007/03/12 23:44:08 tom Exp $ */ + + /* + * $XFree86: xc/programs/xterm/doublechr.c,v 3.18 2006/02/13 01:14:58 dickey Exp $ +@@ -108,7 +108,7 @@ + * we'll be using it for the top (true) or bottom (false) of the line. + */ + void +-xterm_DECDHL(XtermWidget xw, Bool top) ++xterm_DECDHL(XtermWidget xw GCC_UNUSED, Bool top) + { + #if OPT_DEC_CHRSET + repaint_line(xw, (unsigned) (top ? CSET_DHL_TOP : CSET_DHL_BOT)); +@@ -121,7 +121,7 @@ + * Set the line to single-width characters (the normal state). + */ + void +-xterm_DECSWL(XtermWidget xw) ++xterm_DECSWL(XtermWidget xw GCC_UNUSED) + { + #if OPT_DEC_CHRSET + repaint_line(xw, CSET_SWL); +@@ -132,7 +132,7 @@ + * Set the line to double-width characters + */ + void +-xterm_DECDWL(XtermWidget xw) ++xterm_DECDWL(XtermWidget xw GCC_UNUSED) + { + #if OPT_DEC_CHRSET + repaint_line(xw, CSET_DWL); +Index: fixme +--- /dev/null 2007-03-14 18:59:32.580524750 +0000 ++++ xterm-224i/fixme 2007-03-15 00:35:58.000000000 +0000 +@@ -0,0 +1,71 @@ ++AltSendsEsc ++AltIsNotMeta ++pirker report for DECCRA ++tcap-fkeys ++update ctlseqs.pdf ++ ++retest utf-8 title strings ++clear clipboard/primary when switching between the two. ++perhaps ifdef last SuSE change for Xft (or maybe resource-setting) ++ ++key aSE mSE result ++x - - x ++Ax - - x ++Mx - - shift ++AMx - - shift ++x * - x ++Ax * - x ++Mx * - ESC x ++AMx * - ESC x ++x - * x ++Ax - * x ++Mx - * ESC shift ++AMx - * ESC shift ++x * * x ++Ax * * x ++Mx * * ESC x ++AMx * * ESC x ++ ++before DJ's fix ++ ++key aSE mSE result ++x - - x ++Mx - - shift ++x * - x ++Mx * - ESC x ++x - * x ++Mx - * ESC shift ++x * * x ++Mx * * ESC x ++ ++after DJ's fix either aSE or mSE has the same effect on meta: ++ ++key aSE mSE result ++x - - x ++Mx - - shift ++x * - x ++Mx * - ESC x ++x - * x ++Mx - * ESC x ++x * * x ++Mx * * ESC x ++ ++proposed (really implement "Alt Sends Escape" - two new resources) ++ ++key aSE mSE result ++x - - x ++Mx - - shift ++Ax - - shift ++AMx - - shift ++x * - x ++Mx * - x ++Ax * - ESC x ++AMx * - ESC x ++x - * x ++Mx - * ESC x ++Ax - * shift ++AMx - * ESC shift ++x * * x ++Mx * * ESC x ++Ax * * ESC x ++AMx * * ESC x +Index: fontutils.c +--- xterm-224+/fontutils.c 2007-02-04 20:31:31.000000000 +0000 ++++ xterm-224i/fontutils.c 2007-03-05 01:09:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: fontutils.c,v 1.239 2007/02/04 20:31:31 tom Exp $ */ ++/* $XTermId: fontutils.c,v 1.245 2007/03/05 01:09:06 tom Exp $ */ + + /* + * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey Exp $ +@@ -602,7 +602,7 @@ + "\xec\x9c\xa1\xec\xb9\xa0\xed\x8c\x94" \ + "\xea\xb5\xac\xec\x98\x81" + +-#define HALF_WIDTH_CHAR1 0x0031 /* 'l' */ ++#define HALF_WIDTH_CHAR1 0x0031 /* '1' */ + #define HALF_WIDTH_CHAR2 0x0057 /* 'W' */ + #define FULL_WIDTH_CHAR1 0x4E00 /* CJK Ideograph 'number one' */ + #define FULL_WIDTH_CHAR2 0xAC00 /* Korean script syllable 'Ka' */ +@@ -889,12 +889,6 @@ + fnts[fBold] = fnts[fNorm]; + } + +- if (!screen->bold_mode && fnts[fBold] != fnts[fNorm]) { +- TRACE(("...ignoring bold font, as per boldMode\n")); +- xtermCloseFont(xw, fnts[fBold]); +- fnts[fBold] = fnts[fNorm]; +- } +- + if_OPT_WIDE_CHARS(screen, { + if (fnts[fWide] != 0 + && fnts[fWBold] != 0 +@@ -1036,8 +1030,13 @@ + screen->fnt_boxes ? "not " : "")); + #endif + +- screen->enbolden = screen->bold_mode +- && ((fnts[fNorm] == fnts[fBold]) || same_font_name(normal, myfonts.f_b)); ++ if (screen->always_bold_mode) { ++ screen->enbolden = screen->bold_mode; ++ } else { ++ screen->enbolden = screen->bold_mode ++ && ((fnts[fNorm] == fnts[fBold]) ++ || same_font_name(normal, myfonts.f_b)); ++ } + TRACE(("Will %suse 1-pixel offset/overstrike to simulate bold\n", + screen->enbolden ? "" : "not ")); + +@@ -1090,7 +1089,7 @@ + + #define COPY_MENU_FONTS(src,dst) \ + TRACE(("COPY_MENU_FONTS " #src " to " #dst "\n")); \ +- for (n = fontMenu_fontdefault; n <= fontMenu_lastBuiltin; ++n) { \ ++ for (n = fontMenu_default; n <= fontMenu_lastBuiltin; ++n) { \ + for (m = 0; m < fMAX; ++m) { \ + dst.menu_font_names[n][m] = src.menu_font_names[n][m]; \ + } \ +@@ -1171,7 +1170,7 @@ + */ + w->misc.default_font = subresourceRec.default_font; + COPY_MENU_FONTS(subresourceRec, w->screen); +- w->screen.MenuFontName(fontMenu_fontdefault) = w->misc.default_font.f_n; ++ w->screen.MenuFontName(fontMenu_default) = w->misc.default_font.f_n; + } else { + TRACE(("...no resources found\n")); + status = False; +@@ -1280,7 +1279,7 @@ + for (n = 0; n < NMENUFONTS; ++n) + xw->screen.menu_font_sizes[n] = 0; + SetVTFont(xw, font_number, True, +- ((font_number == fontMenu_fontdefault) ++ ((font_number == fontMenu_default) + ? &(xw->misc.default_font) + : NULL)); + } +@@ -1475,7 +1474,7 @@ + */ + lookupOneFontSize(xw, 0); + lookupOneFontSize(xw, fontnum); +- if (fontnum == fontMenu_fontdefault) { ++ if (fontnum == fontMenu_default) { + face_size = 14.0; + } else { + float ratio; +@@ -1520,7 +1519,7 @@ + + if ((pat = XftNameParse(xw->misc.face_name)) != 0) { + XftPatternBuild(pat, +- XFT_FAMILY, XftTypeString, "mono", ++ XFT_FAMILY, XftTypeString, "monospace", + XFT_SIZE, XftTypeDouble, face_size, + XFT_SPACING, XftTypeInteger, XFT_MONO, + (void *) 0); +@@ -1575,9 +1574,9 @@ + face_name, + char_width)); + +- if ((pat = XftNameParse(xw->misc.face_name)) != 0) { ++ if ((pat = XftNameParse(face_name)) != 0) { + XftPatternBuild(pat, +- XFT_FAMILY, XftTypeString, face_name, ++ XFT_FAMILY, XftTypeString, "monospace", + XFT_SIZE, XftTypeDouble, face_size, + XFT_SPACING, XftTypeInteger, XFT_MONO, + XFT_CHAR_WIDTH, XftTypeInteger, char_width, +@@ -2397,6 +2396,50 @@ + } + #endif + ++int ++xtermGetFont(const char *param) ++{ ++ int fontnum; ++ ++ switch (param[0]) { ++ case 'd': ++ case 'D': ++ case '0': ++ fontnum = fontMenu_default; ++ break; ++ case '1': ++ fontnum = fontMenu_font1; ++ break; ++ case '2': ++ fontnum = fontMenu_font2; ++ break; ++ case '3': ++ fontnum = fontMenu_font3; ++ break; ++ case '4': ++ fontnum = fontMenu_font4; ++ break; ++ case '5': ++ fontnum = fontMenu_font5; ++ break; ++ case '6': ++ fontnum = fontMenu_font6; ++ break; ++ case 'e': ++ case 'E': ++ fontnum = fontMenu_fontescape; ++ break; ++ case 's': ++ case 'S': ++ fontnum = fontMenu_fontsel; ++ break; ++ default: ++ fontnum = -1; ++ break; ++ } ++ return fontnum; ++} ++ + /* ARGSUSED */ + void + HandleSetFont(Widget w GCC_UNUSED, +@@ -2411,52 +2454,36 @@ + memset(&fonts, 0, sizeof(fonts)); + + if (*param_count == 0) { +- fontnum = fontMenu_fontdefault; ++ fontnum = fontMenu_default; + } else { + Cardinal maxparams = 1; /* total number of params allowed */ ++ int result = xtermGetFont(params[0]); + +- switch (params[0][0]) { +- case 'd': +- case 'D': +- case '0': +- fontnum = fontMenu_fontdefault; ++ switch (result) { ++ case fontMenu_default: /* FALLTHRU */ ++ case fontMenu_font1: /* FALLTHRU */ ++ case fontMenu_font2: /* FALLTHRU */ ++ case fontMenu_font3: /* FALLTHRU */ ++ case fontMenu_font4: /* FALLTHRU */ ++ case fontMenu_font5: /* FALLTHRU */ ++ case fontMenu_font6: /* FALLTHRU */ + break; +- case '1': +- fontnum = fontMenu_font1; +- break; +- case '2': +- fontnum = fontMenu_font2; +- break; +- case '3': +- fontnum = fontMenu_font3; +- break; +- case '4': +- fontnum = fontMenu_font4; +- break; +- case '5': +- fontnum = fontMenu_font5; +- break; +- case '6': +- fontnum = fontMenu_font6; +- break; +- case 'e': +- case 'E': +- fontnum = fontMenu_fontescape; ++ case fontMenu_fontescape: + #if OPT_WIDE_CHARS + maxparams = 5; + #else + maxparams = 3; + #endif + break; +- case 's': +- case 'S': +- fontnum = fontMenu_fontsel; ++ case fontMenu_fontsel: + maxparams = 2; + break; + default: + Bell(XkbBI_MinorError, 0); + return; + } ++ fontnum = result; ++ + if (*param_count > maxparams) { /* see if extra args given */ + Bell(XkbBI_MinorError, 0); + return; +Index: fontutils.h +--- xterm-224+/fontutils.h 2007-02-11 14:49:56.000000000 +0000 ++++ xterm-224i/fontutils.h 2007-03-05 01:09:40.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: fontutils.h,v 1.60 2007/02/11 14:49:56 tom Exp $ */ ++/* $XTermId: fontutils.h,v 1.61 2007/03/05 01:09:40 tom Exp $ */ + + /* + * $XFree86: xc/programs/xterm/fontutils.h,v 1.17 2006/02/13 01:14:59 dickey Exp $ +@@ -46,6 +46,7 @@ + extern XFontStruct * xtermCloseFont (XtermWidget /* xw */, XFontStruct * /* fnt */); + extern const VTFontNames * xtermFontName (char */* normal */); + extern int lookupRelativeFontSize (XtermWidget /* xw */, int /* old */, int /* relative */); ++extern int xtermGetFont(const char * /* param */); + extern int xtermLoadFont (XtermWidget /* xw */, + const VTFontNames */* fonts */, + Bool /* doresize */, int /* fontnum */); +Index: input.c +--- xterm-224+/input.c 2006-11-28 23:12:47.000000000 +0000 ++++ xterm-224i/input.c 2007-03-14 20:09:42.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: input.c,v 1.269 2006/11/28 23:12:47 tom Exp $ */ ++/* $XTermId: input.c,v 1.270 2007/03/14 20:09:42 tom Exp $ */ + + /* $XFree86: xc/programs/xterm/input.c,v 3.76 2006/06/19 00:36:51 dickey Exp $ */ + +@@ -1175,13 +1175,7 @@ + && screen->meta_sends_esc + && (evt_state & xw->misc.meta_mods) != 0) { + TRACE(("...input-char is modified by META\n")); +- /* +- * If we cannot distinguish between the Alt/Meta keys, disallow +- * the corresponding shift for eightBitInput that would happen +- * in the next chunk of code. +- */ +- if ((evt_state & xw->misc.alt_mods & xw->misc.meta_mods) != 0) +- eightbit = False; ++ eightbit = False; + prefix = ESC; + evt_state &= ~xw->misc.meta_mods; + } +Index: main.c +--- xterm-224+/main.c 2007-02-06 22:37:24.000000000 +0000 ++++ xterm-224i/main.c 2007-03-11 23:10:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: main.c,v 1.538 2007/02/06 22:37:24 tom Exp $ */ ++/* $XTermId: main.c,v 1.544 2007/03/11 23:10:01 tom Exp $ */ + + /* + * W A R N I N G +@@ -456,7 +456,7 @@ + #endif + #ifndef VMS + static SIGNAL_T reapchild(int n); +-static int spawn(void); ++static int spawnXTerm(XtermWidget /* xw */ ); + static void remove_termcap_entry(char *buf, char *str); + #ifdef USE_PTY_SEARCH + static int pty_search(int *pty); +@@ -491,7 +491,7 @@ + ** Ordinarily it should be okay to omit the assignment in the following + ** statement. Apparently the c89 compiler on AIX 4.1.3 has a bug, or does + ** it? Without the assignment though the compiler will init command_to_exec +-** to 0xffffffff instead of NULL; and subsequent usage, e.g. in spawn() to ++** to 0xffffffff instead of NULL; and subsequent usage, e.g. in spawnXTerm() to + ** SEGV. + */ + static char **command_to_exec = NULL; +@@ -866,6 +866,8 @@ + #endif + #if OPT_HIGHLIGHT_COLOR + {"-hc", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL}, ++{"-selfg", "*highlightTextColor", XrmoptionSepArg, (caddr_t) NULL}, ++{"-selbg", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL}, + #endif + #if OPT_HP_FUNC_KEYS + {"-hf", "*hpFunctionKeys",XrmoptionNoArg, (caddr_t) "on"}, +@@ -1048,7 +1050,8 @@ + { "-/+cu", "turn on/off curses emulation" }, + { "-/+dc", "turn off/on dynamic color selection" }, + #if OPT_HIGHLIGHT_COLOR +-{ "-hc color", "selection background color" }, ++{ "-selbg color", "selection background color" }, ++{ "-selfg color", "selection foreground color" }, + #endif + #if OPT_HP_FUNC_KEYS + { "-/+hf", "turn on/off HP Function Key escape codes" }, +@@ -1224,9 +1227,9 @@ + * cannot use that to adjust the $TERMCAP variable. + */ + static Bool +-get_termcap(char *name, char *buffer, char *resized) ++get_termcap(XtermWidget xw, char *name, char *buffer, char *resized) + { +- TScreen *screen = TScreenOf(term); ++ TScreen *screen = TScreenOf(xw); + + *buffer = 0; /* initialize, in case we're using terminfo's tgetent */ + +@@ -1237,7 +1240,7 @@ + ? "ok:termcap, we can update $TERMCAP" + : "assuming this is terminfo"))); + if (*buffer) { +- if (!TEK4014_ACTIVE(term)) { ++ if (!TEK4014_ACTIVE(xw)) { + resize(screen, buffer, resized); + } + } +@@ -1591,9 +1594,11 @@ + } + TRACE_IDS; + } +-#endif ++#else ++#define disableSetUid() /* nothing */ ++#endif /* DISABLE_SETUID */ + +-#if defined(USE_UTMP_SETGID) ++#if defined(DISABLE_SETGID) || defined(USE_UTMP_SETGID) + static void + disableSetGid(void) + { +@@ -1604,7 +1609,9 @@ + } + TRACE_IDS; + } +-#endif /* USE_UTMP_SETGID */ ++#else ++#define disableSetGid() /* nothing */ ++#endif /* DISABLE_SETGID */ + + #if defined(HAVE_POSIX_SAVED_IDS) && !defined(USE_UTEMPTER) + static void +@@ -1663,8 +1670,13 @@ + save_ruid = getuid(); + save_rgid = getgid(); + +-#ifdef DISABLE_SETUID ++#if defined(DISABLE_SETUID) || defined(DISABLE_SETGID) ++#if defined(DISABLE_SETUID) + disableSetUid(); ++#endif ++#if defined(DISABLE_SETGID) ++ disableSetGid(); ++#endif + TRACE_IDS; + #endif + +@@ -2000,11 +2012,17 @@ + XtNumber(application_resources), NULL, 0); + TRACE_XRES(); + +-#if defined(HAVE_POSIX_SAVED_IDS) && !defined(USE_UTMP_SETGID) && !defined(DISABLE_SETUID) ++#if defined(HAVE_POSIX_SAVED_IDS) && !defined(USE_UTMP_SETGID) ++#if !defined(DISABLE_SETUID) || !defined(DISABLE_SETGID) ++#if !defined(DISABLE_SETUID) + setEffectiveUser(save_euid); ++#endif ++#if !defined(DISABLE_SETGID) && !defined(USE_UTEMPTER) + setEffectiveGroup(save_egid); ++#endif + TRACE_IDS; + #endif ++#endif + } + + /* +@@ -2277,7 +2295,7 @@ + } + #endif /* DEBUG */ + +- spawn(); ++ spawnXTerm(term); + + #ifndef VMS + /* Child process is out there, let's catch its termination */ +@@ -2461,8 +2479,8 @@ + + Since we can open either a /dev/ttyp? or a /dev/pts??? device, + the flag "IsPts" is set here so that we know which type of +- device we're dealing with in routine spawn(). That's the reason +- for the "if (IsPts)" statement in spawn(); we have two different ++ device we're dealing with in routine spawnXTerm(). That's the reason ++ for the "if (IsPts)" statement in spawnXTerm(); we have two different + device types which need to be handled differently. + */ + result = pty_search(pty); +@@ -2919,15 +2937,16 @@ + * If slave, the pty named in passedPty is already open for use + */ + static int +-spawn(void) ++spawnXTerm(XtermWidget xw) + { +- TScreen *screen = TScreenOf(term); ++ TScreen *screen = TScreenOf(xw); + #if OPT_PTY_HANDSHAKE + handshake_t handshake; + int done; + #endif + #if OPT_INITIAL_ERASE + int initial_erase = VAL_INITIAL_ERASE; ++ Bool setInitialErase; + #endif + int rc = 0; + int ttyfd = -1; +@@ -3163,7 +3182,7 @@ + wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", + False); + +- if (!TEK4014_ACTIVE(term)) ++ if (!TEK4014_ACTIVE(xw)) + VTInit(); /* realize now so know window size for tty driver */ + #if defined(TIOCCONS) || defined(SRIOCSREDIR) + if (Console) { +@@ -3180,7 +3199,7 @@ + } + #endif + #if OPT_TEK4014 +- if (TEK4014_ACTIVE(term)) { ++ if (TEK4014_ACTIVE(xw)) { + envnew = tekterm; + ptr = newtc; + } else +@@ -3197,13 +3216,13 @@ + * entry is not found. + */ + ok_termcap = True; +- if (!get_termcap(TermName = resource.term_name, ptr, newtc)) { ++ if (!get_termcap(xw, TermName = resource.term_name, ptr, newtc)) { + char *last = NULL; + TermName = *envnew; + ok_termcap = False; + while (*envnew != NULL) { + if ((last == NULL || strcmp(last, *envnew)) +- && get_termcap(*envnew, ptr, newtc)) { ++ && get_termcap(xw, *envnew, ptr, newtc)) { + TermName = *envnew; + ok_termcap = True; + break; +@@ -3220,12 +3239,19 @@ + #if OPT_INITIAL_ERASE + TRACE(("resource ptyInitialErase is %sset\n", + resource.ptyInitialErase ? "" : "not ")); +- if (!resource.ptyInitialErase && ok_termcap) { ++ setInitialErase = False; ++ if (override_tty_modes && ttymodelist[XTTYMODE_erase].set) { ++ initial_erase = ttymodelist[XTTYMODE_erase].value; ++ setInitialErase = True; ++ } else if (resource.ptyInitialErase) { ++ ; ++ } else if (ok_termcap) { + char temp[1024], *p = temp; + char *s = tgetstr(TERMCAP_ERASE, &p); + TRACE(("...extracting initial_erase value from termcap\n")); + if (s != 0) { + initial_erase = decode_keyvalue(&s, True); ++ setInitialErase = True; + } + } + TRACE(("...initial_erase:%d\n", initial_erase)); +@@ -3234,22 +3260,22 @@ + resource.backarrow_is_erase ? "" : "not ")); + if (resource.backarrow_is_erase) { /* see input.c */ + if (initial_erase == DEL) { +- term->keyboard.flags &= ~MODE_DECBKM; ++ xw->keyboard.flags &= ~MODE_DECBKM; + } else { +- term->keyboard.flags |= MODE_DECBKM; +- term->keyboard.reset_DECBKM = 1; ++ xw->keyboard.flags |= MODE_DECBKM; ++ xw->keyboard.reset_DECBKM = 1; + } + TRACE(("...sets DECBKM %s\n", +- (term->keyboard.flags & MODE_DECBKM) ? "on" : "off")); ++ (xw->keyboard.flags & MODE_DECBKM) ? "on" : "off")); + } else { +- term->keyboard.reset_DECBKM = 2; ++ xw->keyboard.reset_DECBKM = 2; + } + #endif /* OPT_INITIAL_ERASE */ + + #ifdef TTYSIZE_STRUCT + /* tell tty how big window is */ + #if OPT_TEK4014 +- if (TEK4014_ACTIVE(term)) { ++ if (TEK4014_ACTIVE(xw)) { + TTYSIZE_ROWS(ts) = 38; + TTYSIZE_COLS(ts) = 81; + #if defined(USE_STRUCT_WINSIZE) +@@ -3347,7 +3373,7 @@ + #ifdef TTYSIZE_STRUCT + /* tell tty how big window is */ + #if OPT_TEK4014 +- if (TEK4014_ACTIVE(term)) { ++ if (TEK4014_ACTIVE(xw)) { + TTYSIZE_ROWS(ts) = 24; + TTYSIZE_COLS(ts) = 80; + #ifdef USE_STRUCT_WINSIZE +@@ -3810,23 +3836,18 @@ + signal(SIGTERM, SIG_DFL); + + /* +- * If we're not asked to make the parent process set the +- * terminal's erase mode, and if we had no ttyModes resource, +- * then set the terminal's erase mode from our best guess. ++ * If we're not asked to let the parent process set the terminal's ++ * erase mode, or if we had the ttyModes erase resource, then set ++ * the terminal's erase mode from our best guess. + */ + #if OPT_INITIAL_ERASE + TRACE(("check if we should set erase to %d:%s\n\tptyInitialErase:%d,\n\toveride_tty_modes:%d,\n\tXTTYMODE_erase:%d\n", + initial_erase, +- (!resource.ptyInitialErase +- && !override_tty_modes +- && !ttymodelist[XTTYMODE_erase].set) +- ? "YES" : "NO", ++ setInitialErase ? "YES" : "NO", + resource.ptyInitialErase, + override_tty_modes, + ttymodelist[XTTYMODE_erase].set)); +- if (!resource.ptyInitialErase +- && !override_tty_modes +- && !ttymodelist[XTTYMODE_erase].set) { ++ if (setInitialErase) { + #if OPT_TRACE + int old_erase; + #endif +@@ -4062,13 +4083,13 @@ + } + #ifdef WTMP + #if defined(WTMPX_FILE) && (defined(SVR4) || defined(__SCO__)) +- if (term->misc.login_shell) ++ if (xw->misc.login_shell) + updwtmpx(WTMPX_FILE, &utmp); + #elif defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)) +- if (term->misc.login_shell) ++ if (xw->misc.login_shell) + call_updwtmp(etc_wtmp, &utmp); + #else +- if (term->misc.login_shell && ++ if (xw->misc.login_shell && + (i = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) { + write(i, (char *) &utmp, sizeof(utmp)); + close(i); +@@ -4102,14 +4123,14 @@ + close(i); + added_utmp_entry = True; + #if defined(WTMP) +- if (term->misc.login_shell && ++ if (xw->misc.login_shell && + (i = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) { + int status; + status = write(i, (char *) &utmp, sizeof(utmp)); + status = close(i); + } + #elif defined(MNX_LASTLOG) +- if (term->misc.login_shell && ++ if (xw->misc.login_shell && + (i = open(_U_LASTLOG, O_WRONLY)) >= 0) { + lseek(i, (long) (screen->uid * + sizeof(utmp)), 0); +@@ -4132,7 +4153,7 @@ + #endif /* USE_SYSV_UTMP */ + + #ifdef USE_LASTLOGX +- if (term->misc.login_shell) { ++ if (xw->misc.login_shell) { + bzero((char *) &lastlogx, sizeof(lastlogx)); + (void) strncpy(lastlogx.ll_line, + my_pty_name(ttydev), +@@ -4144,7 +4165,7 @@ + #endif + + #ifdef USE_LASTLOG +- if (term->misc.login_shell && ++ if (xw->misc.login_shell && + (i = open(etc_lastlog, O_WRONLY)) >= 0) { + size_t size = sizeof(struct lastlog); + off_t offset = (screen->uid * size); +@@ -4254,11 +4275,11 @@ + xtermSetenv("TERMINFO=", OWN_TERMINFO_DIR); + #endif + #else /* USE_SYSV_ENVVARS */ +- if (!TEK4014_ACTIVE(term) && *newtc) { ++ if (!TEK4014_ACTIVE(xw) && *newtc) { + strcpy(termcap, newtc); + resize(screen, termcap, newtc); + } +- if (term->misc.titeInhibit && !term->misc.tiXtraScroll) { ++ if (xw->misc.titeInhibit && !xw->misc.tiXtraScroll) { + remove_termcap_entry(newtc, "ti="); + remove_termcap_entry(newtc, "te="); + } +@@ -4359,11 +4380,11 @@ + #endif /* !TERMIO_STRUCT */ + + #ifdef USE_LOGIN_DASH_P +- if (term->misc.login_shell && pw && added_utmp_entry) ++ if (xw->misc.login_shell && pw && added_utmp_entry) + execl(bin_login, "login", "-p", "-f", login_name, (void *) 0); + #endif + execlp(ptr, +- (term->misc.login_shell ? shname_minus : shname), ++ (xw->misc.login_shell ? shname_minus : shname), + (void *) 0); + + /* Exec failed. */ +@@ -4505,7 +4526,7 @@ + #endif /* USE_SYSV_SIGNALS and not SIGTSTP */ + + return 0; +-} /* end spawn */ ++} /* end spawnXTerm */ + + SIGNAL_T + Exit(int n) +Index: menu.c +--- xterm-224+/menu.c 2007-02-06 22:37:48.000000000 +0000 ++++ xterm-224i/menu.c 2007-03-15 00:36:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: menu.c,v 1.226 2007/02/06 22:37:48 tom Exp $ */ ++/* $XTermId: menu.c,v 1.229 2007/03/15 00:36:57 tom Exp $ */ + + /* + +@@ -124,6 +124,7 @@ + static void do_autolinefeed PROTO_XT_CALLBACK_ARGS; + static void do_autowrap PROTO_XT_CALLBACK_ARGS; + static void do_backarrow PROTO_XT_CALLBACK_ARGS; ++static void do_bellIsUrgent PROTO_XT_CALLBACK_ARGS; + static void do_clearsavedlines PROTO_XT_CALLBACK_ARGS; + static void do_continue PROTO_XT_CALLBACK_ARGS; + static void do_delete_del PROTO_XT_CALLBACK_ARGS; +@@ -131,8 +132,8 @@ + static void do_interrupt PROTO_XT_CALLBACK_ARGS; + static void do_jumpscroll PROTO_XT_CALLBACK_ARGS; + static void do_kill PROTO_XT_CALLBACK_ARGS; +-static void do_marginbell PROTO_XT_CALLBACK_ARGS; + static void do_old_fkeys PROTO_XT_CALLBACK_ARGS; ++static void do_poponbell PROTO_XT_CALLBACK_ARGS; + static void do_print PROTO_XT_CALLBACK_ARGS; + static void do_print_redir PROTO_XT_CALLBACK_ARGS; + static void do_quit PROTO_XT_CALLBACK_ARGS; +@@ -149,7 +150,6 @@ + static void do_terminate PROTO_XT_CALLBACK_ARGS; + static void do_titeInhibit PROTO_XT_CALLBACK_ARGS; + static void do_visualbell PROTO_XT_CALLBACK_ARGS; +-static void do_poponbell PROTO_XT_CALLBACK_ARGS; + static void do_vtfont PROTO_XT_CALLBACK_ARGS; + + #ifdef ALLOWLOGGING +@@ -293,8 +293,8 @@ + { "allow132", do_allow132, NULL }, + { "selectToClipboard",do_selectClipboard, NULL }, + { "visualbell", do_visualbell, NULL }, ++ { "bellIsUrgent", do_bellIsUrgent, NULL }, + { "poponbell", do_poponbell, NULL }, +- { "marginbell", do_marginbell, NULL }, + #if OPT_BLINK_CURS + { "cursorblink", do_cursorblink, NULL }, + #endif +@@ -593,6 +593,10 @@ + update_meta_esc(); + update_delete_del(); + update_keyboard_type(); ++ if (!screen->alt_is_not_meta) { ++ SetItemSensitivity(mainMenuEntries[mainMenu_alt_esc].widget, ++ False); ++ } + if (!xtermHasPrinter()) { + SetItemSensitivity(mainMenuEntries[mainMenu_print].widget, + False); +@@ -848,6 +852,17 @@ + } + + static void ++do_bellIsUrgent(Widget gw GCC_UNUSED, ++ XtPointer closure GCC_UNUSED, ++ XtPointer data GCC_UNUSED) ++{ ++ TScreen *screen = TScreenOf(term); ++ ++ screen->bellIsUrgent = !screen->bellIsUrgent; ++ update_bellIsUrgent(); ++} ++ ++static void + do_poponbell(Widget gw GCC_UNUSED, + XtPointer closure GCC_UNUSED, + XtPointer data GCC_UNUSED) +@@ -940,7 +955,7 @@ + XtPointer closure GCC_UNUSED, + XtPointer data GCC_UNUSED) + { +- term->screen.input_eight_bits = !term->screen.input_eight_bits; ++ term->screen.alt_sends_esc = !term->screen.alt_sends_esc; + update_alt_esc(); + } + +@@ -2039,6 +2054,16 @@ + } + + void ++HandleBellIsUrgent(Widget w, ++ XEvent * event GCC_UNUSED, ++ String * params, ++ Cardinal *param_count) ++{ ++ handle_vt_toggle(do_bellIsUrgent, term->screen.bellIsUrgent, ++ params, *param_count, w); ++} ++ ++void + HandleMarginBell(Widget w, + XEvent * event GCC_UNUSED, + String * params, +@@ -2250,19 +2275,17 @@ + proc = do_tektextlarge; + break; + case 1: +- switch (params[0][0]) { +- case 'l': +- case 'L': ++ switch (TekGetFontSize(params[0])) { ++ case TEK_FONT_LARGE: + proc = do_tektextlarge; + break; +- case '2': ++ case TEK_FONT_2: + proc = do_tektext2; + break; +- case '3': ++ case TEK_FONT_3: + proc = do_tektext3; + break; +- case 's': +- case 'S': ++ case TEK_FONT_SMALL: + proc = do_tektextsmall; + break; + } +@@ -2885,18 +2908,27 @@ + } + + void ++update_bellIsUrgent(void) ++{ ++ UpdateMenuItem(vtMenuEntries[vtMenu_bellIsUrgent].widget, ++ term->screen.bellIsUrgent); ++} ++ ++void + update_poponbell(void) + { + UpdateMenuItem(vtMenuEntries[vtMenu_poponbell].widget, + term->screen.poponbell); + } + ++#ifndef update_marginbell /* 2007-3-7: no longer menu entry */ + void + update_marginbell(void) + { + UpdateMenuItem(vtMenuEntries[vtMenu_marginbell].widget, + term->screen.marginbell); + } ++#endif + + #if OPT_BLINK_CURS + void +Index: menu.h +--- xterm-224+/menu.h 2006-07-23 14:59:13.000000000 +0000 ++++ xterm-224i/menu.h 2007-03-08 01:16:59.000000000 +0000 +@@ -1,8 +1,8 @@ +-/* $XTermId: menu.h,v 1.106 2006/07/23 14:59:13 tom Exp $ */ ++/* $XTermId: menu.h,v 1.108 2007/03/08 01:16:59 tom Exp $ */ + + /* + +-Copyright 1999-2005,2006 by Thomas E. Dickey ++Copyright 1999-2006,2007 by Thomas E. Dickey + + All Rights Reserved + +@@ -78,6 +78,7 @@ + extern void HandleAutoLineFeed PROTO_XT_ACTIONS_ARGS; + extern void HandleAutoWrap PROTO_XT_ACTIONS_ARGS; + extern void HandleBackarrow PROTO_XT_ACTIONS_ARGS; ++extern void HandleBellIsUrgent PROTO_XT_ACTIONS_ARGS; + extern void HandleClearSavedLines PROTO_XT_ACTIONS_ARGS; + extern void HandleCreateMenu PROTO_XT_ACTIONS_ARGS; + extern void HandleCursesEmul PROTO_XT_ACTIONS_ARGS; +@@ -204,8 +205,8 @@ + vtMenu_allow132, + vtMenu_selectToClipboard, + vtMenu_visualbell, ++ vtMenu_bellIsUrgent, + vtMenu_poponbell, +- vtMenu_marginbell, + #if OPT_BLINK_CURS + vtMenu_cursorblink, + #endif +@@ -231,7 +232,7 @@ + * items in vt100 font menu + */ + typedef enum { +- fontMenu_fontdefault, ++ fontMenu_default, + fontMenu_font1, + fontMenu_font2, + fontMenu_font3, +@@ -370,8 +371,10 @@ + extern void update_allow132(void); + extern void update_cursesemul(void); + extern void update_visualbell(void); ++extern void update_bellIsUrgent(void); + extern void update_poponbell(void); +-extern void update_marginbell(void); ++ ++#define update_marginbell() /* nothing */ + + #if OPT_BLINK_CURS + extern void update_cursorblink(void); +Index: misc.c +--- xterm-224+/misc.c 2007-02-11 14:44:45.000000000 +0000 ++++ xterm-224i/misc.c 2007-03-12 23:34:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: misc.c,v 1.342 2007/02/11 14:44:45 e.giaquinta Exp $ */ ++/* $XTermId: misc.c,v 1.354 2007/03/12 23:34:18 e.giaquinta Exp $ */ + + /* $XFree86: xc/programs/xterm/misc.c,v 3.107 2006/06/19 00:36:51 dickey Exp $ */ + +@@ -117,12 +117,147 @@ + (event.xcrossing.window == XtWindow(XtParent(term)))) + #endif + +-static Bool ChangeColorsRequest(XtermWidget, int, char *, int); +-static void DoSpecialEnterNotify(XtermWidget, XEnterWindowEvent *); +-static void DoSpecialLeaveNotify(XtermWidget, XEnterWindowEvent *); +-static void selectwindow(TScreen *, int); +-static void unselectwindow(TScreen *, int); +-static void Sleep(int); ++#if OPT_EXEC_XTERM ++/* Like readlink(2), but returns a malloc()ed buffer, or NULL on ++ error; adapted from libc docs */ ++static char * ++Readlink(const char *filename) ++{ ++ char *buf = NULL; ++ int size = 100; ++ ++ for (;;) { ++ buf = realloc(buf, size); ++ memset(buf, 0, size); ++ ++ int n = readlink(filename, buf, size); ++ if (n < 0) { ++ free(buf); ++ return NULL; ++ } ++ ++ if (n < size) { ++ return buf; ++ } ++ ++ size *= 2; ++ } ++} ++#endif /* OPT_EXEC_XTERM */ ++ ++static void ++Sleep(int msec) ++{ ++ static struct timeval select_timeout; ++ ++ select_timeout.tv_sec = 0; ++ select_timeout.tv_usec = msec * 1000; ++ select(0, 0, 0, 0, &select_timeout); ++} ++ ++static void ++selectwindow(TScreen * screen, int flag) ++{ ++ TRACE(("selectwindow(%d) flag=%d\n", screen->select, flag)); ++ ++#if OPT_TEK4014 ++ if (TEK4014_ACTIVE(term)) { ++ if (!Ttoggled) ++ TCursorToggle(tekWidget, TOGGLE); ++ screen->select |= flag; ++ if (!Ttoggled) ++ TCursorToggle(tekWidget, TOGGLE); ++ } else ++#endif ++ { ++ if (screen->xic) ++ XSetICFocus(screen->xic); ++ ++ if (screen->cursor_state && CursorMoved(screen)) ++ HideCursor(); ++ screen->select |= flag; ++ if (screen->cursor_state) ++ ShowCursor(); ++ } ++} ++ ++static void ++unselectwindow(TScreen * screen, int flag) ++{ ++ TRACE(("unselectwindow(%d) flag=%d\n", screen->select, flag)); ++ ++ if (!screen->always_highlight) { ++#if OPT_TEK4014 ++ if (TEK4014_ACTIVE(term)) { ++ if (!Ttoggled) ++ TCursorToggle(tekWidget, TOGGLE); ++ screen->select &= ~flag; ++ if (!Ttoggled) ++ TCursorToggle(tekWidget, TOGGLE); ++ } else ++#endif ++ { ++ if (screen->xic) ++ XUnsetICFocus(screen->xic); ++ ++ screen->select &= ~flag; ++ if (screen->cursor_state && CursorMoved(screen)) ++ HideCursor(); ++ if (screen->cursor_state) ++ ShowCursor(); ++ } ++ } ++} ++ ++static void ++DoSpecialEnterNotify(XtermWidget xw, XEnterWindowEvent * ev) ++{ ++ TScreen *screen = TScreenOf(xw); ++ ++ TRACE(("DoSpecialEnterNotify(%d)\n", screen->select)); ++#ifdef ACTIVEWINDOWINPUTONLY ++ if (ev->window == XtWindow(XtParent(CURRENT_EMU()))) ++#endif ++ if (((ev->detail) != NotifyInferior) && ++ ev->focus && ++ !(screen->select & FOCUS)) ++ selectwindow(screen, INWINDOW); ++} ++ ++static void ++DoSpecialLeaveNotify(XtermWidget xw, XEnterWindowEvent * ev) ++{ ++ TScreen *screen = TScreenOf(xw); ++ ++ TRACE(("DoSpecialLeaveNotify(%d)\n", screen->select)); ++#ifdef ACTIVEWINDOWINPUTONLY ++ if (ev->window == XtWindow(XtParent(CURRENT_EMU()))) ++#endif ++ if (((ev->detail) != NotifyInferior) && ++ ev->focus && ++ !(screen->select & FOCUS)) ++ unselectwindow(screen, INWINDOW); ++} ++ ++#ifndef XUrgencyHint ++#define XUrgencyHint (1L << 8) /* X11R5 does not define */ ++#endif ++ ++static void ++setXUrgency(TScreen * screen, Boolean enable) ++{ ++ if (screen->bellIsUrgent) { ++ XWMHints *h = XGetWMHints(screen->display, VShellWindow); ++ if (h != 0) { ++ if (enable) { ++ h->flags |= XUrgencyHint; ++ } else { ++ h->flags &= ~XUrgencyHint; ++ } ++ XSetWMHints(screen->display, VShellWindow, h); ++ } ++ } ++} + + void + do_xevents(void) +@@ -298,6 +433,99 @@ + } + } + ++#if OPT_EXEC_XTERM ++ ++#ifndef PROCFS_ROOT ++#define PROCFS_ROOT "/proc" ++#endif ++ ++/* ARGSUSED */ ++void ++HandleSpawnTerminal(Widget w GCC_UNUSED, ++ XEvent * event GCC_UNUSED, ++ String * params, ++ Cardinal *nparams) ++{ ++ TScreen *screen = &term->screen; ++ char *child_cwd = NULL; ++ char *child_exe; ++ pid_t pid; ++ ++ /* ++ * Try to find the actual program which is running in the child process. ++ * This works for Linux. If we cannot find the program, fall back to the ++ * xterm program (which is usually adequate). Give up if we are given only ++ * a relative path to xterm, since that would not always match $PATH. ++ */ ++ child_exe = Readlink(PROCFS_ROOT "/self/exe"); ++ if (!child_exe) { ++ if (strncmp(ProgramName, "./", 2) ++ && strncmp(ProgramName, "../", 3)) { ++ child_exe = xtermFindShell(ProgramName, True); ++ } else { ++ fprintf(stderr, "Cannot exec-xterm given %s\n", ProgramName); ++ } ++ if (child_exe == 0) ++ return; ++ } ++ ++ /* ++ * Determine the current working directory of the child so that we can ++ * spawn a new terminal in the same directory. ++ * ++ * If we cannot get the CWD of the child, just use our own. ++ */ ++ if (screen->pid) { ++ char child_cwd_link[sizeof(PROCFS_ROOT) + 80]; ++ sprintf(child_cwd_link, PROCFS_ROOT "/%lu/cwd", (unsigned long) screen->pid); ++ child_cwd = Readlink(child_cwd_link); ++ } ++ ++ /* The reaper will take care of cleaning up the child */ ++ pid = fork(); ++ if (pid == -1) { ++ fprintf(stderr, "Could not fork: %s\n", SysErrorMsg(errno)); ++ } else if (!pid) { ++ /* We are the child */ ++ if (child_cwd) { ++ chdir(child_cwd); /* We don't care if this fails */ ++ } ++ ++ if (setuid(screen->uid) == -1 ++ || setgid(screen->gid) == -1) { ++ fprintf(stderr, "Cannot reset uid/gid\n"); ++ } else { ++ if (nparams != 0) { ++ int myargc = *nparams + 1; ++ char **myargv = TypeMallocN(char *, myargc + 1); ++ if (myargv != 0) { ++ int n = 0; ++ myargv[n++] = child_exe; ++ while (n <= myargc) { ++ myargv[n] = params[n - 1]; ++ ++n; ++ } ++ myargv[n] = 0; ++ execv(child_exe, myargv); ++ } ++ } else { ++ execl(child_exe, child_exe, NULL); ++ } ++ ++ /* If we get here, we've failed */ ++ fprintf(stderr, "exec of '%s': %s\n", child_exe, SysErrorMsg(errno)); ++ } ++ _exit(0); ++ } else { ++ /* We are the parent; clean up */ ++ if (child_cwd) ++ free(child_cwd); ++ if (child_exe) ++ free(child_exe); ++ } ++} ++#endif /* OPT_EXEC_XTERM */ ++ + /* + * Rather than sending characters to the host, put them directly into our + * input queue. That lets a user have access to any of the control sequences +@@ -333,21 +561,6 @@ + } + } + +-static void +-DoSpecialEnterNotify(XtermWidget xw, XEnterWindowEvent * ev) +-{ +- TScreen *screen = TScreenOf(xw); +- +- TRACE(("DoSpecialEnterNotify(%d)\n", screen->select)); +-#ifdef ACTIVEWINDOWINPUTONLY +- if (ev->window == XtWindow(XtParent(CURRENT_EMU()))) +-#endif +- if (((ev->detail) != NotifyInferior) && +- ev->focus && +- !(screen->select & FOCUS)) +- selectwindow(screen, INWINDOW); +-} +- + /*ARGSUSED*/ + void + HandleEnterWindow(Widget w GCC_UNUSED, +@@ -359,21 +572,6 @@ + TRACE(("HandleEnterWindow ignored\n")); + } + +-static void +-DoSpecialLeaveNotify(XtermWidget xw, XEnterWindowEvent * ev) +-{ +- TScreen *screen = TScreenOf(xw); +- +- TRACE(("DoSpecialLeaveNotify(%d)\n", screen->select)); +-#ifdef ACTIVEWINDOWINPUTONLY +- if (ev->window == XtWindow(XtParent(CURRENT_EMU()))) +-#endif +- if (((ev->detail) != NotifyInferior) && +- ev->focus && +- !(screen->select & FOCUS)) +- unselectwindow(screen, INWINDOW); +-} +- + /*ARGSUSED*/ + void + HandleLeaveWindow(Widget w GCC_UNUSED, +@@ -402,6 +600,8 @@ + event->detail)); + + if (event->type == FocusIn) { ++ setXUrgency(screen, False); ++ + /* + * NotifyNonlinear only happens (on FocusIn) if the pointer was not in + * one of our windows. Use this to reset a case where one xterm is +@@ -444,60 +644,6 @@ + } + } + +-static void +-selectwindow(TScreen * screen, int flag) +-{ +- TRACE(("selectwindow(%d) flag=%d\n", screen->select, flag)); +- +-#if OPT_TEK4014 +- if (TEK4014_ACTIVE(term)) { +- if (!Ttoggled) +- TCursorToggle(tekWidget, TOGGLE); +- screen->select |= flag; +- if (!Ttoggled) +- TCursorToggle(tekWidget, TOGGLE); +- } else +-#endif +- { +- if (screen->xic) +- XSetICFocus(screen->xic); +- +- if (screen->cursor_state && CursorMoved(screen)) +- HideCursor(); +- screen->select |= flag; +- if (screen->cursor_state) +- ShowCursor(); +- } +-} +- +-static void +-unselectwindow(TScreen * screen, int flag) +-{ +- TRACE(("unselectwindow(%d) flag=%d\n", screen->select, flag)); +- +- if (!screen->always_highlight) { +-#if OPT_TEK4014 +- if (TEK4014_ACTIVE(term)) { +- if (!Ttoggled) +- TCursorToggle(tekWidget, TOGGLE); +- screen->select &= ~flag; +- if (!Ttoggled) +- TCursorToggle(tekWidget, TOGGLE); +- } else +-#endif +- { +- if (screen->xic) +- XUnsetICFocus(screen->xic); +- +- screen->select &= ~flag; +- if (screen->cursor_state && CursorMoved(screen)) +- HideCursor(); +- if (screen->cursor_state) +- ShowCursor(); +- } +- } +-} +- + static long lastBellTime; /* in milliseconds */ + + void +@@ -512,6 +658,8 @@ + return; + } + ++ setXUrgency(screen, True); ++ + /* has enough time gone by that we are allowed to ring + the bell again? */ + if (screen->bellSuppressTime) { +@@ -700,15 +848,16 @@ + + static int x, y; + static char *dabbrev_hint = 0, *lastexpansion = 0; ++ static unsigned int expansions; + + char *expansion; + Char *copybuffer; + size_t hint_len; +- unsigned i; + unsigned del_cnt; + unsigned buf_cnt; + + if (!screen->dabbrev_working) { /* initialize */ ++ expansions = 0; + x = screen->cur_col; + y = screen->cur_row + screen->savelines; + +@@ -729,7 +878,8 @@ + hint_len = strlen(dabbrev_hint); + for (;;) { + if (!(expansion = dabbrev_prev_word(&x, &y, screen))) { +- if (strcmp(lastexpansion, dabbrev_hint)) { ++ if (expansions >= 2) { ++ expansions = 0; + x = screen->cur_col; + y = screen->cur_row + screen->savelines; + continue; +@@ -748,9 +898,7 @@ + buf_cnt = del_cnt + strlen(expansion) - hint_len; + if (!(copybuffer = TypeMallocN(Char, buf_cnt))) + return 0; +- for (i = 0; i < del_cnt; i++) { /* delete previous expansion */ +- copybuffer[i] = screen->dabbrev_erase_char; +- } ++ memset(copybuffer, screen->dabbrev_erase_char, del_cnt); /* delete previous expansion */ + memmove(copybuffer + del_cnt, + expansion + hint_len, + strlen(expansion) - hint_len); +@@ -762,6 +910,7 @@ + lastexpansion = strdup(expansion); + if (!lastexpansion) + return 0; ++ expansions++; + return 1; + } + +@@ -1386,94 +1535,118 @@ + unparse_end(xw); + } + +-/* +-* Find closest color for "def" in "cmap". +-* Set "def" to the resulting color. +-* Based on Monish Shah's "find_closest_color()" for Vim 6.0, +-* modified with ideas from David Tong's "noflash" library. +-* Return False if not able to find or allocate a color. +-*/ + static int +-find_closest_color(Display * display, Colormap cmap, XColor * def) ++getColormapSize(Display * display) + { +- double tmp, distance, closestDistance; +- int closest, numFound; +- XColor *colortable; ++ int result; ++ int numFound; + XVisualInfo myTemplate, *visInfoPtr; +- char *found; +- unsigned i; +- unsigned cmap_size; +- unsigned attempts; + + myTemplate.visualid = XVisualIDFromVisual(DefaultVisual(display, + XDefaultScreen(display))); + visInfoPtr = XGetVisualInfo(display, (long) VisualIDMask, + &myTemplate, &numFound); +- if (numFound < 1) { +- /* FindClosestColor couldn't lookup visual */ +- return False; +- } ++ result = (numFound >= 1) ? visInfoPtr->colormap_size : 0; + +- cmap_size = visInfoPtr->colormap_size; + XFree((char *) visInfoPtr); +- colortable = TypeMallocN(XColor, cmap_size); +- if (!colortable) { +- return False; /* out of memory */ +- } +- found = TypeCallocN(char, cmap_size); +- if (!found) { +- free(colortable); +- return False; /* out of memory */ +- } +- +- for (i = 0; i < cmap_size; i++) { +- colortable[i].pixel = (unsigned long) i; +- } +- XQueryColors(display, cmap, colortable, (int) cmap_size); ++ return result; ++} + +- /* +- * Find the color that best approximates the desired one, then +- * try to allocate that color. If that fails, it must mean that +- * the color was read-write (so we can't use it, since its owner +- * might change it) or else it was already freed. Try again, +- * over and over again, until something succeeds. +- */ +- for (attempts = 0; attempts < cmap_size; attempts++) { +- closestDistance = 1e30; +- closest = 0; +- for (i = 0; i < cmap_size; i++) { +- if (!found[closest]) { +- /* +- * Use Euclidean distance in RGB space, weighted by Y (of YIQ) +- * as the objective function; this accounts for differences +- * in the color sensitivity of the eye. +- */ +- tmp = .30 * (((int) def->red) - (int) colortable[i].red); +- distance = tmp * tmp; +- tmp = .61 * (((int) def->green) - (int) colortable[i].green); +- distance += tmp * tmp; +- tmp = .11 * (((int) def->blue) - (int) colortable[i].blue); +- distance += tmp * tmp; +- if (distance < closestDistance) { +- closest = i; +- closestDistance = distance; +- } +- } +- } +- if (XAllocColor(display, cmap, &colortable[closest]) != 0) { +- *def = colortable[closest]; +- break; +- } +- found[closest] = True; /* Don't look at this entry again */ +- } ++/* ++ * Find closest color for "def" in "cmap". ++ * Set "def" to the resulting color. ++ * ++ * Based on Monish Shah's "find_closest_color()" for Vim 6.0, ++ * modified with ideas from David Tong's "noflash" library. ++ * The code from Vim in turn was derived from FindClosestColor() in Tcl/Tk. ++ * ++ * These provide some introduction: ++ * http://en.wikipedia.org/wiki/YIQ ++ * for an introduction to YIQ weights. ++ * http://en.wikipedia.org/wiki/Luminance_(video) ++ * for a discussion of luma. ++ * http://en.wikipedia.org/wiki/YUV ++ * ++ * Return False if not able to find or allocate a color. ++ */ ++static Boolean ++find_closest_color(Display * dpy, Colormap cmap, XColor * def) ++{ ++ Boolean result = False; ++ XColor *colortable; ++ char *tried; ++ double diff, thisRGB, bestRGB; ++ unsigned attempts; ++ unsigned bestInx; ++ unsigned cmap_size; ++ unsigned i; + +- free(colortable); +- free(found); +- if (attempts < cmap_size) { +- return True; /* Got a closest matching color */ +- } else { +- return False; /* Couldn't allocate a near match */ ++ cmap_size = getColormapSize(dpy); ++ if (cmap_size != 0) { ++ ++ colortable = TypeMallocN(XColor, cmap_size); ++ if (colortable != 0) { ++ ++ tried = TypeCallocN(char, cmap_size); ++ if (tried != 0) { ++ ++ for (i = 0; i < cmap_size; i++) { ++ colortable[i].pixel = (unsigned long) i; ++ } ++ XQueryColors(dpy, cmap, colortable, (int) cmap_size); ++ ++ /* ++ * Try (possibly each entry in the color map) to find the best ++ * approximation to the requested color. ++ */ ++ for (attempts = 0; attempts < cmap_size; attempts++) { ++ Boolean first = True; ++ ++ bestRGB = 0.0; ++ bestInx = 0; ++ for (i = 0; i < cmap_size; i++) { ++ if (!tried[bestInx]) { ++ /* ++ * Look for the best match based on luminance. ++ * Measure this by the least-squares difference of ++ * the weighted R/G/B components from the color map ++ * versus the requested color. Use the Y (luma) ++ * component of the YIQ color space model for ++ * weights that correspond to the luminance. ++ */ ++#define AddColorWeight(weight, color) \ ++ diff = weight * (int) ((def->color) - colortable[i].color); \ ++ thisRGB = diff * diff ++ ++ AddColorWeight(0.30, red); ++ AddColorWeight(0.61, green); ++ AddColorWeight(0.11, blue); ++ ++ if (first || (thisRGB < bestRGB)) { ++ first = False; ++ bestInx = i; ++ bestRGB = thisRGB; ++ } ++ } ++ } ++ if (XAllocColor(dpy, cmap, &colortable[bestInx]) != 0) { ++ *def = colortable[bestInx]; ++ result = True; ++ break; ++ } ++ /* ++ * It failed - either the color map entry was readonly, or ++ * another client has allocated the entry. Mark the entry ++ * so we will ignore it ++ */ ++ tried[bestInx] = True; ++ } ++ free(tried); ++ } ++ free(colortable); ++ } + } ++ return result; + } + + /* +@@ -1701,10 +1874,7 @@ + PtyData data; + Boolean controls = True; + +- memset(&data, 0, sizeof(data)); +- data.next = cp; +- data.last = last; +- if (decodeUtf8(&data)) { ++ if (decodeUtf8(fakePtyData(&data, cp, last))) { + if (data.utf_data != UCS_REPL + && (data.utf_data >= 128 || + ansi_table[data.utf_data] == CASE_PRINT)) { +@@ -1732,6 +1902,237 @@ + return result; + } + ++/***====================================================================***/ ++ ++/* ++ * Enum corresponding to the actual OSC codes rather than the internal ++ * array indices. ++ */ ++typedef enum { ++ OSC_TEXT_FG = 10 ++ ,OSC_TEXT_BG ++ ,OSC_TEXT_CURSOR ++ ,OSC_MOUSE_FG ++ ,OSC_MOUSE_BG ++#if OPT_TEK4014 ++ ,OSC_TEK_FG = 15 ++ ,OSC_TEK_BG ++#endif ++#if OPT_HIGHLIGHT_COLOR ++ ,OSC_HIGHLIGHT_BG = 17 ++#endif ++#if OPT_TEK4014 ++ ,OSC_TEK_CURSOR = 18 ++#endif ++#if OPT_HIGHLIGHT_COLOR ++ ,OSC_HIGHLIGHT_FG = 19 ++#endif ++ ,OSC_NCOLORS ++} OscTextColors; ++ ++static ScrnColors *pOldColors = NULL; ++ ++static Bool ++GetOldColors(XtermWidget xw) ++{ ++ int i; ++ if (pOldColors == NULL) { ++ pOldColors = (ScrnColors *) XtMalloc(sizeof(ScrnColors)); ++ if (pOldColors == NULL) { ++ fprintf(stderr, "allocation failure in GetOldColors\n"); ++ return (False); ++ } ++ pOldColors->which = 0; ++ for (i = 0; i < NCOLORS; i++) { ++ pOldColors->colors[i] = 0; ++ pOldColors->names[i] = NULL; ++ } ++ GetColors(xw, pOldColors); ++ } ++ return (True); ++} ++ ++static int ++oppositeColor(int n) ++{ ++ switch (n) { ++ case TEXT_FG: ++ n = TEXT_BG; ++ break; ++ case TEXT_BG: ++ n = TEXT_FG; ++ break; ++ case MOUSE_FG: ++ n = MOUSE_BG; ++ break; ++ case MOUSE_BG: ++ n = MOUSE_FG; ++ break; ++#if OPT_TEK4014 ++ case TEK_FG: ++ n = TEK_BG; ++ break; ++ case TEK_BG: ++ n = TEK_FG; ++ break; ++#endif ++#if OPT_HIGHLIGHT_COLOR ++ case HIGHLIGHT_FG: ++ n = HIGHLIGHT_BG; ++ break; ++ case HIGHLIGHT_BG: ++ n = HIGHLIGHT_FG; ++ break; ++#endif ++ default: ++ break; ++ } ++ return n; ++} ++ ++static void ++ReportColorRequest(XtermWidget xw, int ndx, int final) ++{ ++ XColor color; ++ Colormap cmap = xw->core.colormap; ++ char buffer[80]; ++ ++ /* ++ * ChangeColorsRequest() has "always" chosen the opposite color when ++ * reverse-video is set. Report this as the original color index, but ++ * reporting the opposite color which would be used. ++ */ ++ int i = (xw->misc.re_verse) ? oppositeColor(ndx) : ndx; ++ ++ GetOldColors(xw); ++ color.pixel = pOldColors->colors[ndx]; ++ XQueryColor(xw->screen.display, cmap, &color); ++ sprintf(buffer, "%d;rgb:%04x/%04x/%04x", i + 10, ++ color.red, ++ color.green, ++ color.blue); ++ TRACE(("ReportColors %d: %#lx as %s\n", ndx, pOldColors->colors[ndx], buffer)); ++ unparseputc1(xw, OSC); ++ unparseputs(xw, buffer); ++ unparseputc1(xw, final); ++ unparse_end(xw); ++} ++ ++static Bool ++UpdateOldColors(XtermWidget xw GCC_UNUSED, ScrnColors * pNew) ++{ ++ int i; ++ ++ /* if we were going to free old colors, this would be the place to ++ * do it. I've decided not to (for now), because it seems likely ++ * that we'd have a small set of colors we use over and over, and that ++ * we could save some overhead this way. The only case in which this ++ * (clearly) fails is if someone is trying a boatload of colors, in ++ * which case they can restart xterm ++ */ ++ for (i = 0; i < NCOLORS; i++) { ++ if (COLOR_DEFINED(pNew, i)) { ++ if (pOldColors->names[i] != NULL) { ++ XtFree(pOldColors->names[i]); ++ pOldColors->names[i] = NULL; ++ } ++ if (pNew->names[i]) { ++ pOldColors->names[i] = pNew->names[i]; ++ } ++ pOldColors->colors[i] = pNew->colors[i]; ++ } ++ } ++ return (True); ++} ++ ++/* ++ * OSC codes are constant, but the indices for the color arrays depend on how ++ * xterm is compiled. ++ */ ++static int ++OscToColorIndex(OscTextColors mode) ++{ ++ int result = 0; ++ ++#define CASE(name) case OSC_##name: result = name; break ++ switch (mode) { ++ CASE(TEXT_FG); ++ CASE(TEXT_BG); ++ CASE(TEXT_CURSOR); ++ CASE(MOUSE_FG); ++ CASE(MOUSE_BG); ++#if OPT_TEK4014 ++ CASE(TEK_FG); ++ CASE(TEK_BG); ++#endif ++#if OPT_HIGHLIGHT_COLOR ++ CASE(HIGHLIGHT_BG); ++ CASE(HIGHLIGHT_FG); ++#endif ++#if OPT_TEK4014 ++ CASE(TEK_CURSOR); ++#endif ++ case OSC_NCOLORS: ++ break; ++ } ++ return result; ++} ++ ++static Bool ++ChangeColorsRequest(XtermWidget xw, ++ int start, ++ char *names, ++ int final) ++{ ++ Bool result = False; ++ char *thisName; ++ ScrnColors newColors; ++ int i, ndx; ++ ++ TRACE(("ChangeColorsRequest start=%d, names='%s'\n", start, names)); ++ ++ if (GetOldColors(xw)) { ++ newColors.which = 0; ++ for (i = 0; i < NCOLORS; i++) { ++ newColors.names[i] = NULL; ++ } ++ for (i = start; i < OSC_NCOLORS; i++) { ++ ndx = OscToColorIndex(i); ++ if (xw->misc.re_verse) ++ ndx = oppositeColor(ndx); ++ ++ if ((names == NULL) || (names[0] == '\0')) { ++ newColors.names[ndx] = NULL; ++ } else { ++ if (names[0] == ';') ++ thisName = NULL; ++ else ++ thisName = names; ++ names = strchr(names, ';'); ++ if (names != NULL) { ++ *names++ = '\0'; ++ } ++ if (thisName != 0 && !strcmp(thisName, "?")) { ++ ReportColorRequest(xw, ndx, final); ++ } else if (!pOldColors->names[ndx] ++ || (thisName ++ && strcmp(thisName, pOldColors->names[ndx]))) { ++ AllocateTermColor(xw, &newColors, ndx, thisName); ++ } ++ } ++ } ++ ++ if (newColors.which != 0) { ++ ChangeColors(xw, &newColors); ++ UpdateOldColors(xw, &newColors); ++ } ++ result = True; ++ } ++ return result; ++} ++ ++/***====================================================================***/ ++ + void + do_osc(XtermWidget xw, Char * oscbuf, unsigned len GCC_UNUSED, int final) + { +@@ -1816,21 +2217,21 @@ + ChangeAnsiColorRequest(xw, buf, final); + break; + #endif +- case 10 + TEXT_FG: +- case 10 + TEXT_BG: +- case 10 + TEXT_CURSOR: +- case 10 + MOUSE_FG: +- case 10 + MOUSE_BG: ++ case OSC_TEXT_FG: ++ case OSC_TEXT_BG: ++ case OSC_TEXT_CURSOR: ++ case OSC_MOUSE_FG: ++ case OSC_MOUSE_BG: + #if OPT_HIGHLIGHT_COLOR +- case 10 + HIGHLIGHT_BG: ++ case OSC_HIGHLIGHT_BG: + #endif + #if OPT_TEK4014 +- case 10 + TEK_FG: +- case 10 + TEK_BG: +- case 10 + TEK_CURSOR: ++ case OSC_TEK_FG: ++ case OSC_TEK_BG: ++ case OSC_TEK_CURSOR: + #endif + if (xw->misc.dynamicColors) +- ChangeColorsRequest(xw, mode - 10, buf, final); ++ ChangeColorsRequest(xw, mode, buf, final); + break; + + case 30: +@@ -2533,113 +2934,6 @@ + + /***====================================================================***/ + +-static ScrnColors *pOldColors = NULL; +- +-static Bool +-GetOldColors(XtermWidget xw) +-{ +- int i; +- if (pOldColors == NULL) { +- pOldColors = (ScrnColors *) XtMalloc(sizeof(ScrnColors)); +- if (pOldColors == NULL) { +- fprintf(stderr, "allocation failure in GetOldColors\n"); +- return (False); +- } +- pOldColors->which = 0; +- for (i = 0; i < NCOLORS; i++) { +- pOldColors->colors[i] = 0; +- pOldColors->names[i] = NULL; +- } +- GetColors(xw, pOldColors); +- } +- return (True); +-} +- +-static int +-oppositeColor(int n) +-{ +- switch (n) { +- case TEXT_FG: +- n = TEXT_BG; +- break; +- case TEXT_BG: +- n = TEXT_FG; +- break; +- case MOUSE_FG: +- n = MOUSE_BG; +- break; +- case MOUSE_BG: +- n = MOUSE_FG; +- break; +-#if OPT_TEK4014 +- case TEK_FG: +- n = TEK_BG; +- break; +- case TEK_BG: +- n = TEK_FG; +- break; +-#endif +- default: +- break; +- } +- return n; +-} +- +-static void +-ReportColorRequest(XtermWidget xw, int ndx, int final) +-{ +- XColor color; +- Colormap cmap = xw->core.colormap; +- char buffer[80]; +- +- /* +- * ChangeColorsRequest() has "always" chosen the opposite color when +- * reverse-video is set. Report this as the original color index, but +- * reporting the opposite color which would be used. +- */ +- int i = (xw->misc.re_verse) ? oppositeColor(ndx) : ndx; +- +- GetOldColors(xw); +- color.pixel = pOldColors->colors[ndx]; +- XQueryColor(xw->screen.display, cmap, &color); +- sprintf(buffer, "%d;rgb:%04x/%04x/%04x", i + 10, +- color.red, +- color.green, +- color.blue); +- TRACE(("ReportColors %d: %#lx as %s\n", ndx, pOldColors->colors[ndx], buffer)); +- unparseputc1(xw, OSC); +- unparseputs(xw, buffer); +- unparseputc1(xw, final); +- unparse_end(xw); +-} +- +-static Bool +-UpdateOldColors(XtermWidget xw GCC_UNUSED, ScrnColors * pNew) +-{ +- int i; +- +- /* if we were going to free old colors, this would be the place to +- * do it. I've decided not to (for now), because it seems likely +- * that we'd have a small set of colors we use over and over, and that +- * we could save some overhead this way. The only case in which this +- * (clearly) fails is if someone is trying a boatload of colors, in +- * which case they can restart xterm +- */ +- for (i = 0; i < NCOLORS; i++) { +- if (COLOR_DEFINED(pNew, i)) { +- if (pOldColors->names[i] != NULL) { +- XtFree(pOldColors->names[i]); +- pOldColors->names[i] = NULL; +- } +- if (pNew->names[i]) { +- pOldColors->names[i] = pNew->names[i]; +- } +- pOldColors->colors[i] = pNew->colors[i]; +- } +- } +- return (True); +-} +- + /* + * This is part of ReverseVideo(). It reverses the data stored for the old + * "dynamic" colors that might have been retrieved using OSC 10-18. +@@ -2705,67 +2999,9 @@ + TRACE(("AllocateTermColor #%d: %s (failed)\n", ndx, name)); + return (False); + } +- +-static Bool +-ChangeColorsRequest(XtermWidget xw, +- int start, +- char *names, +- int final) +-{ +- char *thisName; +- ScrnColors newColors; +- int i, ndx; +- +- TRACE(("ChangeColorsRequest start=%d, names='%s'\n", start, names)); +- +- if ((pOldColors == NULL) +- && (!GetOldColors(xw))) { +- return (False); +- } +- newColors.which = 0; +- for (i = 0; i < NCOLORS; i++) { +- newColors.names[i] = NULL; +- } +- for (i = start; i < NCOLORS; i++) { +- if (xw->misc.re_verse) +- ndx = oppositeColor(i); +- else +- ndx = i; +- if ((names == NULL) || (names[0] == '\0')) { +- newColors.names[ndx] = NULL; +- } else { +- if (names[0] == ';') +- thisName = NULL; +- else +- thisName = names; +- names = strchr(names, ';'); +- if (names != NULL) { +- *names = '\0'; +- names++; +- } +- if (thisName != 0 && !strcmp(thisName, "?")) +- ReportColorRequest(xw, ndx, final); +- else if (!pOldColors->names[ndx] +- || (thisName +- && strcmp(thisName, pOldColors->names[ndx]))) { +- AllocateTermColor(xw, &newColors, ndx, thisName); +- } +- } +- } +- +- if (newColors.which == 0) +- return (True); +- +- ChangeColors(xw, &newColors); +- UpdateOldColors(xw, &newColors); +- return (True); +-} +- + /***====================================================================***/ + +-#ifndef DEBUG + /* ARGSUSED */ +-#endif + void + Panic(char *s GCC_UNUSED, int a GCC_UNUSED) + { +@@ -2865,16 +3101,6 @@ + Cleanup(i); + } + +-static void +-Sleep(int msec) +-{ +- static struct timeval select_timeout; +- +- select_timeout.tv_sec = 0; +- select_timeout.tv_usec = msec * 1000; +- select(0, 0, 0, 0, &select_timeout); +-} +- + /* + * cleanup by sending SIGHUP to client processes + */ +Index: os2main.c +--- xterm-224+/os2main.c 2007-02-06 22:37:24.000000000 +0000 ++++ xterm-224i/os2main.c 2007-03-11 23:30:39.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: os2main.c,v 1.239 2007/02/06 22:37:24 tom Exp $ */ ++/* $XTermId: os2main.c,v 1.241 2007/03/11 23:30:39 tom Exp $ */ + + /* removed all foreign stuff to get the code more clear (hv) + * and did some rewrite for the obscure OS/2 environment +@@ -125,17 +125,20 @@ + #include + + static SIGNAL_T reapchild(int n); +-static int spawn(void); ++static int spawnXTerm(XtermWidget /* xw */ ); + static void resize(TScreen * s, char *oldtc, char *newtc); + static void set_owner(char *device, uid_t uid, gid_t gid, mode_t mode); + + static Bool added_utmp_entry = False; + ++static uid_t save_ruid; ++static gid_t save_rgid; ++ + /* + ** Ordinarily it should be okay to omit the assignment in the following + ** statement. Apparently the c89 compiler on AIX 4.1.3 has a bug, or does + ** it? Without the assignment though the compiler will init command_to_exec +-** to 0xffffffff instead of NULL; and subsequent usage, e.g. in spawn() to ++** to 0xffffffff instead of NULL; and subsequent usage, e.g. in spawnXTerm() to + ** SEGV. + */ + static char **command_to_exec = NULL; +@@ -378,6 +381,8 @@ + #endif + #if OPT_HIGHLIGHT_COLOR + {"-hc", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL}, ++{"-selfg", "*highlightTextColor", XrmoptionSepArg, (caddr_t) NULL}, ++{"-selbg", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL}, + #endif + #if OPT_HP_FUNC_KEYS + {"-hf", "*hpFunctionKeys",XrmoptionNoArg, (caddr_t) "on"}, +@@ -560,7 +565,8 @@ + { "-/+cu", "turn on/off curses emulation" }, + { "-/+dc", "turn off/on dynamic color selection" }, + #if OPT_HIGHLIGHT_COLOR +-{ "-hc color", "selection background color" }, ++{ "-selbg color", "selection background color" }, ++{ "-selfg color", "selection foreground color" }, + #endif + #if OPT_HP_FUNC_KEYS + { "-/+hf", "turn on/off HP Function Key escape codes" }, +@@ -743,9 +749,9 @@ + * cannot use that to adjust the $TERMCAP variable. + */ + static Bool +-get_termcap(char *name, char *buffer, char *resized) ++get_termcap(XtermWidget xw, char *name, char *buffer, char *resized) + { +- TScreen *screen = TScreenOf(term); ++ TScreen *screen = TScreenOf(xw); + + *buffer = 0; /* initialize, in case we're using terminfo's tgetent */ + +@@ -756,7 +762,7 @@ + ? "ok:termcap, we can update $TERMCAP" + : "assuming this is terminfo"))); + if (*buffer) { +- if (!TEK4014_ACTIVE(term)) { ++ if (!TEK4014_ACTIVE(xw)) { + resize(screen, buffer, resized); + } + } +@@ -922,8 +928,12 @@ + Bool reversed = False; + #endif + +- /* Do these first, since we may not be able to open the display */ + ProgramName = argv[0]; ++ ++ save_ruid = getuid(); ++ save_rgid = getgid(); ++ ++ /* Do these first, since we may not be able to open the display */ + TRACE_OPTS(xtermOptions, optionDescList, XtNumber(optionDescList)); + TRACE_ARGV("Before XtOpenApplication", argv); + if (argc > 1) { +@@ -1097,7 +1107,7 @@ + /* Must be owner and have read/write permission. + xdm cooperates to give the console the right user. */ + if (!stat("/dev/console", &sbuf) && +- (sbuf.st_uid == getuid()) && ++ (sbuf.st_uid == save_ruid) && + !access("/dev/console", R_OK | W_OK)) { + Console = True; + } else +@@ -1259,10 +1269,13 @@ + /* Set up stderr properly. Opening this log file cannot be + done securely by a privileged xterm process (although we try), + so the debug feature is disabled by default. */ ++ char dbglogfile[45]; + int i = -1; + if (debug) { +- creat_as(getuid(), getgid(), True, "xterm.debug.log", 0666); +- i = open("xterm.debug.log", O_WRONLY | O_TRUNC); ++ timestamp_filename(dbglogfile, "xterm.debug.log."); ++ if (creat_as(save_ruid, save_rgid, False, dbglogfile, 0666) > 0) { ++ i = open(dbglogfile, O_WRONLY | O_TRUNC); ++ } + } + if (i >= 0) { + dup2(i, 2); +@@ -1273,7 +1286,7 @@ + } + #endif /* DEBUG */ + +- spawn(); ++ spawnXTerm(term); + + /* Child process is out there, let's catch its termination */ + (void) signal(SIGCHLD, reapchild); +@@ -1485,7 +1498,7 @@ + if (chown(device, uid, gid) < 0) { + why = errno; + if (why != ENOENT +- && getuid() == 0) { ++ && save_ruid == 0) { + fprintf(stderr, "Cannot chown %s to %ld,%ld: %s\n", + device, (long) uid, (long) gid, strerror(why)); + } +@@ -1540,14 +1553,14 @@ + #define close_fd(fd) close(fd), fd = -1 + + static int +-spawn(void) ++spawnXTerm(XtermWidget xw) + /* + * Inits pty and tty and forks a login process. + * Does not close fd Xsocket. + * If slave, the pty named in passedPty is already open for use + */ + { +- TScreen *screen = TScreenOf(term); ++ TScreen *screen = TScreenOf(xw); + int Xsocket = ConnectionNumber(screen->display); + + int ttyfd = -1; +@@ -1563,8 +1576,8 @@ + int pgrp = getpid(); + char numbuf[12], **envnew; + +- screen->uid = getuid(); +- screen->gid = getgid(); ++ screen->uid = save_ruid; ++ screen->gid = save_rgid; + + if (am_slave >= 0) { + screen->respond = am_slave; +@@ -1636,7 +1649,7 @@ + wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", + False); + +- if (!TEK4014_ACTIVE(term)) ++ if (!TEK4014_ACTIVE(xw)) + VTInit(); /* realize now so know window size for tty driver */ + + if (Console) { +@@ -1652,7 +1665,7 @@ + ConvertConsoleSelection, NULL, NULL); + } + #if OPT_TEK4014 +- if (TEK4014_ACTIVE(term)) { ++ if (TEK4014_ACTIVE(xw)) { + envnew = tekterm; + ptr = newtc; + } else +@@ -1668,12 +1681,12 @@ + * the program to proceed (but not to set $TERMCAP) if the termcap + * entry is not found. + */ +- if (!get_termcap(TermName = resource.term_name, ptr, newtc)) { ++ if (!get_termcap(xw, TermName = resource.term_name, ptr, newtc)) { + char *last = NULL; + TermName = *envnew; + while (*envnew != NULL) { + if ((last == NULL || strcmp(last, *envnew)) +- && get_termcap(*envnew, ptr, newtc)) { ++ && get_termcap(xw, *envnew, ptr, newtc)) { + TermName = *envnew; + break; + } +@@ -1684,7 +1697,7 @@ + + /* tell tty how big window is */ + #if OPT_TEK4014 +- if (TEK4014_ACTIVE(term)) { ++ if (TEK4014_ACTIVE(xw)) { + TTYSIZE_ROWS(ts) = 38; + TTYSIZE_COLS(ts) = 81; + ts.ws_xpixel = TFullWidth(&(tekWidget->screen)); +@@ -1952,7 +1965,7 @@ + signal(SIGQUIT, SIG_IGN); + /* signal (SIGTERM, SIG_IGN);*/ + return 0; +-} /* end spawn */ ++} /* end spawnXTerm */ + + SIGNAL_T + Exit(int n) +Index: ptydata.c +--- xterm-224+/ptydata.c 2006-08-25 20:39:49.000000000 +0000 ++++ xterm-224i/ptydata.c 2007-03-12 23:42:49.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: ptydata.c,v 1.75 2006/08/25 20:39:49 tom Exp $ */ ++/* $XTermId: ptydata.c,v 1.77 2007/03/12 23:42:49 tom Exp $ */ + + /* + * $XFree86: xc/programs/xterm/ptydata.c,v 1.25 2006/02/13 01:14:59 dickey Exp $ +@@ -6,7 +6,7 @@ + + /************************************************************ + +-Copyright 1999-2005,2006 by Thomas E. Dickey ++Copyright 1999-2006,2007 by Thomas E. Dickey + + All Rights Reserved + +@@ -249,7 +249,7 @@ + */ + #if OPT_WIDE_CHARS + Bool +-morePtyData(TScreen * screen GCC_UNUSED, PtyData * data) ++morePtyData(TScreen * screen, PtyData * data) + { + Bool result = (data->last > data->next); + if (result && screen->utf8_inparse) { +@@ -272,9 +272,7 @@ + { + IChar result; + if (screen->utf8_inparse) { +- result = data->utf_data; +- data->next += data->utf_size; +- data->utf_size = 0; ++ result = skipPtyData(data); + } else { + result = *((data)->next++); + if (!screen->output_eight_bits) +@@ -283,6 +281,20 @@ + TRACE2(("nextPtyData returns %#x\n", result)); + return result; + } ++ ++/* ++ * Simply return the data and skip past it. ++ */ ++IChar ++skipPtyData(PtyData * data) ++{ ++ IChar result = data->utf_data; ++ ++ data->next += data->utf_size; ++ data->utf_size = 0; ++ ++ return result; ++} + #endif + + #if OPT_WIDE_CHARS +@@ -302,6 +314,9 @@ + } + #endif + ++/* ++ * Allocate a buffer. ++ */ + void + initPtyData(PtyData ** result) + { +@@ -329,6 +344,23 @@ + } + + /* ++ * Initialize a buffer for the caller, using its data in 'source'. ++ */ ++#if OPT_WIDE_CHARS ++PtyData * ++fakePtyData(PtyData * result, Char * next, Char * last) ++{ ++ PtyData *data = result; ++ ++ memset(data, 0, sizeof(*data)); ++ data->next = next; ++ data->last = last; ++ ++ return data; ++} ++#endif ++ ++/* + * Remove used data by shifting the buffer down, to make room for more data, + * e.g., a continuation-read. + */ +Index: ptyx.h +--- xterm-224+/ptyx.h 2007-02-11 14:54:34.000000000 +0000 ++++ xterm-224i/ptyx.h 2007-03-15 00:32:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: ptyx.h,v 1.467 2007/02/11 14:54:34 tom Exp $ */ ++/* $XTermId: ptyx.h,v 1.474 2007/03/15 00:32:01 tom Exp $ */ + + /* $XFree86: xc/programs/xterm/ptyx.h,v 3.134 2006/06/19 00:36:51 dickey Exp $ */ + +@@ -135,7 +135,7 @@ + #define USE_PTY_DEVICE 1 + #define USE_PTY_SEARCH 1 + +-#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) + #undef USE_PTY_DEVICE + #undef USE_PTY_SEARCH + #define USE_PTS_DEVICE 1 +@@ -473,6 +473,10 @@ + #endif + #endif + ++#ifndef OPT_EXEC_XTERM ++#define OPT_EXEC_XTERM 0 /* true if xterm can fork/exec copies of itself */ ++#endif ++ + #ifndef OPT_FOCUS_EVENT + #define OPT_FOCUS_EVENT 1 /* focus in/out events */ + #endif +@@ -758,12 +762,11 @@ + #if OPT_TEK4014 + , TEK_FG /* tektronix foreground */ + , TEK_BG /* tektronix background */ ++ , TEK_CURSOR /* tektronix cursor */ + #endif + #if OPT_HIGHLIGHT_COLOR + , HIGHLIGHT_BG /* highlight background */ +-#endif +-#if OPT_TEK4014 +- , TEK_CURSOR /* tektronix cursor */ ++ , HIGHLIGHT_FG /* highlight foreground */ + #endif + , NCOLORS /* total number of colors */ + } TermColors; +@@ -1530,12 +1533,13 @@ + int vtXX_level; /* 0=vt52, 1,2,3 = vt100 ... vt320 */ + int ansi_level; /* levels 1,2,3 */ + int protected_mode; /* 0=off, 1=DEC, 2=ISO */ +- Boolean old_fkeys; /* true for compatible fkeys */ ++ Boolean always_bold_mode; /* compare normal/bold font */ ++ Boolean always_highlight; /* whether to highlight cursor */ ++ Boolean bold_mode; /* use bold font or overstrike */ + Boolean delete_is_del; /* true for compatible Delete key */ + Boolean jumpscroll; /* whether we should jumpscroll */ +- Boolean always_highlight; /* whether to highlight cursor */ ++ Boolean old_fkeys; /* true for compatible fkeys */ + Boolean underline; /* whether to underline text */ +- Boolean bold_mode; /* whether to use bold font */ + + #if OPT_MAXIMIZE + Boolean restore_data; +@@ -1566,6 +1570,7 @@ + int visualBellDelay; /* msecs to delay for visibleBell */ + int bellSuppressTime; /* msecs after Bell before another allowed */ + Boolean bellInProgress; /* still ringing/flashing prev bell? */ ++ Boolean bellIsUrgent; /* set XUrgency WM hint on bell */ + /* + * Select/paste state. + */ +@@ -1624,11 +1629,14 @@ + Boolean output_eight_bits; /* honor all bits or strip */ + Boolean control_eight_bits; /* send CSI as 8-bits */ + Boolean backarrow_key; /* backspace/delete */ ++ Boolean alt_is_not_meta; /* use both Alt- and Meta-key */ ++ Boolean alt_sends_esc; /* Alt-key sends ESC prefix */ + Boolean meta_sends_esc; /* Meta-key sends ESC prefix */ + /* + * Fonts + */ + Pixmap menu_item_bitmap; /* mask for checking items */ ++ String initial_font; + String menu_font_names[NMENUFONTS][fMAX]; + #define MenuFontName(n) menu_font_names[n][fNorm] + long menu_font_sizes[NMENUFONTS]; +Index: util.c +--- xterm-224+/util.c 2007-02-11 21:47:22.000000000 +0000 ++++ xterm-224i/util.c 2007-03-14 21:59:28.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: util.c,v 1.336 2007/02/11 21:47:22 tom Exp $ */ ++/* $XTermId: util.c,v 1.344 2007/03/14 21:59:28 tom Exp $ */ + + /* $XFree86: xc/programs/xterm/util.c,v 3.98 2006/06/19 00:36:52 dickey Exp $ */ + +@@ -1402,6 +1402,7 @@ + TScreen *screen = &(xw->screen); + Pixel c = getXtermBackground(xw, xw->flags, color); + ++ TRACE(("set_background(%d) %#lx\n", color, c)); + XSetWindowBackground(screen->display, VShellWindow, c); + XSetWindowBackground(screen->display, VWindow(screen), c); + } +@@ -1547,6 +1548,11 @@ + TRACE(("... HIGHLIGHT_BG: %#lx\n", T_COLOR(screen, HIGHLIGHT_BG))); + repaint = screen->Vshow; + } ++ if (COLOR_DEFINED(pNew, HIGHLIGHT_FG)) { ++ T_COLOR(screen, HIGHLIGHT_FG) = COLOR_VALUE(pNew, HIGHLIGHT_FG); ++ TRACE(("... HIGHLIGHT_FG: %#lx\n", T_COLOR(screen, HIGHLIGHT_FG))); ++ repaint = screen->Vshow; ++ } + #endif + + if (COLOR_DEFINED(pNew, MOUSE_FG) || (COLOR_DEFINED(pNew, MOUSE_BG))) { +@@ -1876,7 +1882,7 @@ + static int slen = 0; + + XftFont *wfont; +- int n; ++ int src, dst; + XftFont *lastFont = 0; + XftFont *currFont = 0; + int start = 0; +@@ -1904,17 +1910,20 @@ + slen * sizeof(XftCharSpec)); + } + +- for (n = 0; n < len; n++) { ++ for (src = dst = 0; src < len; src++) { + FcChar32 wc = *text++; + + if (text2) + wc |= (*text2++ << 8); + +- sbuf[n].ucs4 = wc; +- sbuf[n].x = x + fwidth * ncells; +- sbuf[n].y = y; +- + charWidth = xtermCellWidth(xw, wc); ++ if (charWidth < 0) ++ continue; ++ ++ sbuf[dst].ucs4 = wc; ++ sbuf[dst].x = x + fwidth * ncells; ++ sbuf[dst].y = y; ++ + currFont = (charWidth == 2 && wfont != 0) ? wfont : font; + ncells += charWidth; + +@@ -1924,18 +1933,19 @@ + color, + lastFont, + sbuf + start, +- n - start); ++ dst - start); + } +- start = n; ++ start = dst; + lastFont = currFont; + } ++ ++dst; + } +- if ((n != start) && really) { ++ if ((dst != start) && really) { + XftDrawCharSpec(screen->renderDraw, + color, + lastFont, + sbuf + start, +- n - start); ++ dst - start); + } + #else /* !OPT_RENDERWIDE */ + PAIRED_CHARS((void) text, (void) text2); +@@ -1957,6 +1967,44 @@ + + #if OPT_WIDE_CHARS + /* ++ * Map characters commonly "fixed" by groff back to their ASCII equivalents. ++ * Also map other useful equivalents. ++ */ ++unsigned ++AsciiEquivs(unsigned ch) ++{ ++ switch (ch) { ++ case 0x2010: /* groff "-" */ ++ case 0x2011: ++ case 0x2012: ++ case 0x2013: ++ case 0x2014: ++ case 0x2015: ++ case 0x2212: /* groff "\-" */ ++ ch = '-'; ++ break; ++ case 0x2018: /* groff "`" */ ++ ch = '`'; ++ break; ++ case 0x2019: /* groff ' */ ++ ch = '\''; ++ break; ++ case 0x201C: /* groff lq */ ++ case 0x201D: /* groff rq */ ++ ch = '"'; ++ break; ++ default: ++ if (ch >= 0xff01 && ch <= 0xff5e) { ++ /* "Fullwidth" codes (actually double-width) */ ++ ch -= 0xfff0; ++ ch += 0x20; ++ break; ++ } ++ } ++ return ch; ++} ++ ++/* + * Actually this should be called "groff_workaround()" - for the places where + * groff stomps on compatibility. Still, if enough people get used to it, + * this might someday become a quasi-standard. +@@ -1975,36 +2023,13 @@ + int fixed = False; + + if (screen->wide_chars && screen->utf8_mode && ch > 256) { +- switch (ch) { +- case 0x2010: /* groff "-" */ +- case 0x2011: +- case 0x2012: +- case 0x2013: +- case 0x2014: +- case 0x2015: +- case 0x2212: /* groff "\-" */ +- ch = '-'; +- fixed = True; +- break; +- case 0x2018: /* groff "`" */ +- ch = '`'; +- fixed = True; +- break; +- case 0x2019: /* groff ' */ +- ch = '\''; +- fixed = True; +- break; +- case 0x201C: /* groff lq */ +- case 0x201D: /* groff rq */ +- ch = '"'; +- fixed = True; +- break; +- } +- if (fixed) { ++ unsigned eqv = AsciiEquivs(ch); ++ ++ if (eqv != ch) { + Char text[2]; + Char text2[2]; + +- text[0] = ch; ++ text[0] = eqv; + text2[0] = 0; + drawXtermText(xw, + flags, +@@ -2768,7 +2793,8 @@ + Pixel bg_pix = getXtermBackground(xw, flags, my_bg); + Pixel xx_pix; + #if OPT_HIGHLIGHT_COLOR +- Pixel hi_pix = T_COLOR(screen, HIGHLIGHT_BG); ++ Pixel selbg_pix = T_COLOR(screen, HIGHLIGHT_BG); ++ Pixel selfg_pix = T_COLOR(screen, HIGHLIGHT_FG); + #endif + + (void) fg_bg; +@@ -2777,25 +2803,25 @@ + + checkVeryBoldColors(flags, my_fg); + ++#if OPT_HIGHLIGHT_COLOR ++ if (hilite) { ++ Bool use_selbg = isNotForeground(xw, fg_pix, bg_pix, selbg_pix); ++ Bool use_selfg = isNotBackground(xw, fg_pix, bg_pix, selfg_pix); ++ ++ if (use_selbg) ++ fg_pix = selbg_pix; ++ if (use_selfg) ++ bg_pix = selfg_pix; ++ } ++#endif ++ + if (ReverseOrHilite(screen, flags, hilite)) { + if (flags & BOLDATTR(screen)) { + cgsId = gcBoldReverse; + } else { + cgsId = gcNormReverse; + } +- +-#if OPT_HIGHLIGHT_COLOR +- if (hi_pix != T_COLOR(screen, TEXT_FG) +- && hi_pix != fg_pix +- && hi_pix != bg_pix +- && hi_pix != xw->dft_foreground) { +- bg_pix = fg_pix; +- fg_pix = hi_pix; +- } +-#endif +- xx_pix = bg_pix; +- bg_pix = fg_pix; +- fg_pix = xx_pix; ++ EXCHANGE(fg_pix, bg_pix, xx_pix); + } else { + if (flags & BOLDATTR(screen)) { + cgsId = gcBold; +@@ -2933,6 +2959,8 @@ + + XClearArea(screen->display, VWindow(screen), + left, top, width, height, False); ++ ++ set_background(xw, -1); + } + } + #endif /* OPT_ISO_COLORS */ +Index: xterm.h +--- xterm-224+/xterm.h 2007-02-07 23:45:38.000000000 +0000 ++++ xterm-224i/xterm.h 2007-03-15 00:33:43.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: xterm.h,v 1.445 2007/02/07 23:45:38 tom Exp $ */ ++/* $XTermId: xterm.h,v 1.456 2007/03/15 00:33:43 tom Exp $ */ + + /* $XFree86: xc/programs/xterm/xterm.h,v 3.117 2006/06/19 00:36:52 dickey Exp $ */ + +@@ -327,6 +327,9 @@ + #define XtNallowC1Printable "allowC1Printable" + #define XtNallowSendEvents "allowSendEvents" + #define XtNallowWindowOps "allowWindowOps" ++#define XtNaltIsNotMeta "altIsNotMeta" ++#define XtNaltSendsEscape "altSendsEscape" ++#define XtNalwaysBoldMode "alwaysBoldMode" + #define XtNalwaysHighlight "alwaysHighlight" + #define XtNalwaysUseMods "alwaysUseMods" + #define XtNanswerbackString "answerbackString" +@@ -335,6 +338,7 @@ + #define XtNautoWrap "autoWrap" + #define XtNawaitInput "awaitInput" + #define XtNbackarrowKey "backarrowKey" ++#define XtNbellIsUrgent "bellIsUrgent" + #define XtNbellOnReset "bellOnReset" + #define XtNbellSuppressTime "bellSuppressTime" + #define XtNboldColors "boldColors" +@@ -383,8 +387,10 @@ + #define XtNfreeBoldBox "freeBoldBox" + #define XtNhighlightColor "highlightColor" + #define XtNhighlightSelection "highlightSelection" ++#define XtNhighlightTextColor "highlightTextColor" + #define XtNhpLowerleftBugCompat "hpLowerleftBugCompat" + #define XtNi18nSelections "i18nSelections" ++#define XtNinitialFont "initialFont" + #define XtNinternalBorder "internalBorder" + #define XtNitalicULMode "italicULMode" + #define XtNjumpScroll "jumpScroll" +@@ -465,6 +471,9 @@ + #define XtCAllowC1Printable "AllowC1Printable" + #define XtCAllowSendEvents "AllowSendEvents" + #define XtCAllowWindowOps "AllowWindowOps" ++#define XtCAltIsNotMeta "AltIsNotMeta" ++#define XtCAltSendsEscape "AltSendsEscape" ++#define XtCAlwaysBoldMode "AlwaysBoldMode" + #define XtCAlwaysHighlight "AlwaysHighlight" + #define XtCAlwaysUseMods "AlwaysUseMods" + #define XtCAnswerbackString "AnswerbackString" +@@ -473,6 +482,7 @@ + #define XtCAutoWrap "AutoWrap" + #define XtCAwaitInput "AwaitInput" + #define XtCBackarrowKey "BackarrowKey" ++#define XtCBellIsUrgent "BellIsUrgent" + #define XtCBellOnReset "BellOnReset" + #define XtCBellSuppressTime "BellSuppressTime" + #define XtCBoldFont "BoldFont" +@@ -517,6 +527,7 @@ + #define XtCHighlightSelection "HighlightSelection" + #define XtCHpLowerleftBugCompat "HpLowerleftBugCompat" + #define XtCI18nSelections "I18nSelections" ++#define XtCInitialFont "InitialFont" + #define XtCJumpScroll "JumpScroll" + #define XtCKeyboardDialect "KeyboardDialect" + #define XtCLimitResize "LimitResize" +@@ -595,10 +606,12 @@ + #define XtCCursorColor "CursorColor" + #define XtCPointerColor "PointerColor" + #define XtCHighlightColor "HighlightColor" ++#define XtCHighlightTextColor "HighlightTextColor" + #else + #define XtCCursorColor XtCForeground + #define XtCPointerColor XtCForeground + #define XtCHighlightColor XtCForeground ++#define XtCHighlightTextColor XtCBackground + #endif + + /***====================================================================***/ +@@ -611,6 +624,7 @@ + + /* Tekproc.c */ + #if OPT_TEK4014 ++extern int TekGetFontSize (const char * /* param */); + extern int TekInit (void); + extern int TekPtyData(void); + extern void ChangeTekColors (TekWidget /* tw */, TScreen * /* screen */, ScrnColors * /* pNew */); +@@ -835,9 +849,9 @@ + extern int xioerror (Display * /* dpy */); + extern int xtermResetIds(TScreen * /* screen */); + extern void Bell (Atom /* which */, int /* percent */); +-extern void ChangeXprop (char * /* name */); + extern void ChangeIconName (char * /* name */); + extern void ChangeTitle (char * /* name */); ++extern void ChangeXprop (char * /* name */); + extern void Cleanup (int /* code */); + extern void HandleBellPropertyChange PROTO_XT_EV_HANDLER_ARGS; + extern void HandleEightBitKeyPressed PROTO_XT_ACTIONS_ARGS; +@@ -846,6 +860,7 @@ + extern void HandleInterpret PROTO_XT_ACTIONS_ARGS; + extern void HandleKeyPressed PROTO_XT_ACTIONS_ARGS; + extern void HandleLeaveWindow PROTO_XT_EV_HANDLER_ARGS; ++extern void HandleSpawnTerminal PROTO_XT_ACTIONS_ARGS; + extern void HandleStringEvent PROTO_XT_ACTIONS_ARGS; + extern void Panic (char * /* s */, int /* a */); + extern void Redraw (void); +@@ -924,6 +939,8 @@ + extern Bool morePtyData (TScreen * /* screen */, PtyData * /* data */); + extern Char *convertToUTF8 (Char * /* lp */, unsigned /* c */); + extern IChar nextPtyData (TScreen * /* screen */, PtyData * /* data */); ++extern IChar skipPtyData (PtyData * /* data */); ++extern PtyData * fakePtyData(PtyData * /* result */, Char * /* next */, Char * /* last */); + extern void switchPtyData (TScreen * /* screen */, int /* f */); + extern void writePtyData (int /* f */, IChar * /* d */, unsigned /* len */); + #else +@@ -1149,7 +1166,21 @@ + extern unsigned getXtermCell (TScreen * /* screen */, int /* row */, int /* col */); + extern void putXtermCell (TScreen * /* screen */, int /* row */, int /* col */, int /* ch */); + ++#if OPT_HIGHLIGHT_COLOR ++#define isNotForeground(xw, fg, bg, sel) \ ++ ((sel) != T_COLOR(&((xw)->screen), TEXT_FG) \ ++ && (sel) != (fg) \ ++ && (sel) != (bg) \ ++ && (sel) != (xw)->dft_foreground) ++#define isNotBackground(xw, fg, bg, sel) \ ++ ((sel) != T_COLOR(&((xw)->screen), TEXT_BG) \ ++ && (sel) != (fg) \ ++ && (sel) != (bg) \ ++ && (sel) != (xw)->dft_background) ++#endif ++ + #if OPT_WIDE_CHARS ++extern unsigned AsciiEquivs(unsigned /* ch */); + extern unsigned getXtermCellComb (TScreen * /* screen */, int /* row */, int /* col */, int /* off */); + extern unsigned getXtermCellComb1 (TScreen * /* screen */, int /* row */, int /* col */); + extern unsigned getXtermCellComb2 (TScreen * /* screen */, int /* row */, int /* col */); +Index: xterm.log.html +--- xterm-224+/xterm.log.html 2007-02-11 15:24:42.000000000 +0000 ++++ xterm-224i/xterm.log.html 2007-03-14 22:02:08.000000000 +0000 +@@ -20,7 +20,7 @@ + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * + ***************************************************************************** +- $XTermId: xterm.log.html,v 1.517 2007/02/11 15:24:42 tom Exp $ ++ $XTermId: xterm.log.html,v 1.540 2007/03/14 22:02:08 tom Exp $ + $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38 dickey Exp $ + --> + +@@ -46,6 +46,7 @@ + is the latest version of this file. + + + ++

Development

++
    ++
  • revert a change from patch #216 ++ that unnecessarily made the meta modifier override ++ the eightBitInput resource if the alt- and ++ meta-modifiers happened to overlap ++ (report/patch by Daniel Jacobowitz). ++ ++
  • correct associated font for active icon for colored text ++ (broken in patch #224). ++ ++
  • correct ifdef's for Darwin (patch by Emanuele Giaquinta). ++ ++
  • add highlightTextColor resource, and options ++ -selfg, -selbg like xwsh ++ (adapted from patch by Victor Vaile). ++ ++
  • revise find_closest_color() function to address ++ concern about borrowing from Tcl/Tk ++ (request by Dan McNichol). ++ ++
  • add "spawn-new-terminal" action, which can be assigned to key ++ translation, allowing one to spawn a new copy of xterm using ++ the current process' working directory (adapted from patch ++ by Daniel Colascio). ++ ++
  • improve select/paste between UTF-8 and Latin1 xterms by adapting ++ the translations from patch #185. ++ Extend that to include Unicode fullwidth forms FF00-FF5E. ++ Also modify select/paste of DEC line-drawing characters in ++ Latin1 mode to use ASCII characters. ++ ++
  • add "Enable Bell Urgency" to VT Options menu, removed "Enable ++ Margin Bell". ++ ++
  • add bellIsUrgent resource to control whether the ++ Urgency hint is set/reset. ++ ++
  • modify to set Urgency window manager hint on bell, reset it on ++ Focus-In event (patch by Emanuele Giaquinta). ++ ++
  • add --disable-setgid configure option (request by ++ Miroslav Lichvar). ++ ++
  • fix a possible infinite loop in last change to ++ dabbrev-expand() (patch by Emanuele Giaquinta). ++ ++
  • modify initialization to set the pty erase value if the ++ erase is set in the ttyModes resource. ++ This overrides the ptyInitialErase setting (request by ++ Lluís Batlle i Rossell). ++ ++
  • add initialFont resource to xterm widget, like ++ tek-widget (Debian #299669). ++ ++
  • amend change to boldMode from ++ patch #223 for Debian #347790. ++ As noted in Debian #412599, that made xterm ++ no longer match the documented behavior. ++ Add new resource alwaysBoldMode ++ to allow overriding the comparison ++ between normal/bold fonts when deciding whether to use overstriking ++ to simulate bold fonts. ++ ++
  • restore background color in ClearCurBackground(), omitted in ++ changes for patch #223 (report by ++ Miroslav Lichvar). ++ ++
  • correct logic for repainting double-width TrueType characters ++ (prompted by test-case for Novell #246573). ++ ++
  • add a check to avoid trying to repeat a multibyte character ++ (report by Sami Farin). ++ ++
  • modify parameter to XftNameParse() to select wide ++ face-name as needed, to make -fd option work (patch by ++ Mike Fabian, Novell #246573). ++ ++
  • correct logic for mouse highlight tracking's abort sequence, ++ broken in a restructuring modification from ++ patch #224 ++ (report by Thomas Wolff). ++ ++
  • revert the simplification of blinking cursor, since that broke ++ the xor'ing introduced in patch #193 ++ (report by Thomas Wolff). ++
++ +

Patch #224 - 2007/2/11

+
    +
  • simplify code for set/reset mode for blinking cursor +@@ -287,7 +376,7 @@ +
  • improve startup performance of menus by adding resource setting + menuLocale which can be set to override X's + lengthy initialization of fontsets - which are seldom used +- for the Xaw popup menus (adapted by patch by ++ for the Xaw popup menus (adapted from patch by + Dave Coffin). + +
  • modify do_precomposition() function and make-compose.sh to handle +Index: xterm.man +--- xterm-224+/xterm.man 2007-02-08 00:23:05.000000000 +0000 ++++ xterm-224i/xterm.man 2007-03-14 23:48:59.000000000 +0000 +@@ -1,4 +1,5 @@ +-.\" $XTermId: xterm.man,v 1.363 2007/02/08 00:23:05 tom Exp $ ++'\" t ++.\" $XTermId: xterm.man,v 1.374 2007/03/14 23:48:59 tom Exp $ + .\" + .\" Copyright 1996-2006,2007 by Thomas E. Dickey + .\" +@@ -441,7 +442,7 @@ + If only one of the normal or bold fonts is specified, it will be used as the + normal font and the bold font will be produced by overstriking this font. + The default is to do overstriking of the normal font. +-See also the discussion of \fBboldFont\fP and \fBboldMode\fP resources. ++See also the discussion of \fBboldFont\fP, \fBboldMode\fP and \fBalwaysBoldMode\fP resources. + .TP 8 + .BI -fa " pattern" + This option sets the pattern for fonts selected from the FreeType +@@ -511,11 +512,7 @@ + See also the discussion of the \fBximFont\fP resource. + .TP 8 + .BI -hc " color" +-This option specifies the color to use for the background of +-selected or otherwise highlighted text. +-If not specified, +-reverse video is used. +-See the discussion of the \fBhighlightColor\fP resource. ++(see \fB-selbg\fP). + .TP 8 + .BI -hf + This option indicates that HP Function Key escape codes should be generated +@@ -800,6 +797,16 @@ + .B +sb + This option indicates that a scrollbar should not be displayed. + .TP 8 ++.BI -selbg " color" ++This option specifies the color to use for the background of selected text. ++If not specified, reverse video is used. ++See the discussion of the \fBhighlightColor\fP resource. ++.TP 8 ++.BI -selfg " color" ++This option specifies the color to use for selected text. ++If not specified, reverse video is used. ++See the discussion of the \fBhighlightTextColor\fP resource. ++.TP 8 + .B -sf + This option indicates that Sun Function Key escape codes should be generated + for function keys. +@@ -1216,6 +1223,7 @@ + a reference, if available. + In either case, the result is applied to the TERMCAP variable + which \fIxterm\fP sets. ++See also the \fBttyModes\fP resource, which may modify this. + The default is ``false''. + .TP 8 + .B "sameName (\fPclass\fB SameName)" +@@ -1312,6 +1320,10 @@ + an \fIxterm\fP is started. + Note, however, that the stty program on a given host may use different + keywords; \fIxterm\fR's table is built-in. ++.IP ++If the \fBttyModes\fP resource specifies a value for \fBerase\fP, ++that overrides the \fBptyInitialErase\fP resource setting, ++i.e., \fIxterm\fP initializes the terminal to match that value. + .TP 8 + .B "useInsertMode (\fPclass\fB UseInsertMode)" + Force use of insert mode by adding appropriate entries to the TERMCAP +@@ -1384,6 +1396,26 @@ + for should be allowed. + The default is ``true.'' + .TP 8 ++.B "alwaysBoldMode (\fPclass\fB AlwaysBoldMode)" ++Specifies whether \fIxterm\fP should check if the normal and bold ++fonts are distinct before deciding whether to use overstriking to ++simulate bold fonts. ++If this resource is true, ++\fIxterm\fP does not make the check for ++distinct fonts when deciding how to handle the \fBboldMode\fP resource. ++The default is ``false.'' ++.TS ++l l l l ++_ _ _ _ ++l l l l. ++\fIboldMode\fR \fIalwaysBoldMode\fR \fIComparison\fR \fIAction\fP ++false false ignored use font ++false true ignored use font ++true false same overstrike ++true false different use font ++true true ignored overstrike ++.TE ++.TP 8 + .B "alwaysHighlight (\fPclass\fB AlwaysHighlight)" + Specifies whether or not \fIxterm\fP should always display a highlighted + text cursor. +@@ -1437,6 +1469,11 @@ + The default is + ``XtDefaultBackground.'' + .TP 8 ++.B "bellIsUrgent (\fPclass\fB BellIsUrgent)" ++Specifies whether to set the Urgency hint for the window manager ++when making a bell sound. ++The default is ``false.'' ++.TP 8 + .B "bellOnReset (\fPclass\fB BellOnReset)" + Specifies whether to sound a bell when doing a hard reset. + The default is ``true.'' +@@ -1467,13 +1504,19 @@ + same as the normal font. + It may be desirable to disable bold fonts when color is being + used for the bold attribute. ++.IP + Note that \fIxterm\fP has one bold font which you may set explicitly. +-It attempts to match a bold font for the other font selections ++\fIXterm\fP attempts to derive a bold font for the other font selections + (\fBfont1\fP through \fBfont6\fP). +-If the normal and bold fonts are distinct, this resource has no effect. ++If it cannot find a bold font, it will use the normal font. ++In each case (whether the explicit resource or the derived font), ++if the normal and bold fonts are distinct, this resource has no effect. + The default is ``true.'' + .IP +-Although \fIxterm\fP attempts to match a bold font for other font selections, ++See the \fBalwaysBoldMode\fP resource which can modify the behavior ++of this resource. ++.IP ++Although \fIxterm\fP attempts to derive a bold font for other font selections, + the font server may not cooperate. + Since X11R6, bitmap fonts have been scaled. + The font server claims to provide the bold font that \fIxterm\fP requests, +@@ -1751,7 +1794,7 @@ + .TP 8 + .B "eightBitInput (\fPclass\fB EightBitInput\fP)" + If ``true'', Meta characters +-(a single-byte character combined with the \fIkeys\fP modifier key) ++(a single-byte character combined with the \fIMeta\fP modifier key) + input from the keyboard are presented as a + single character with the eighth bit turned on. + The terminal is put into 8-bit mode. +@@ -1930,9 +1973,8 @@ + There is no default for this resource. + .TP 8 + .B "highlightColor (\fPclass\fB HighlightColor)" +-Specifies the color to use for the background of selected or otherwise +-highlighted text. +-If not specified, reverse video is used. ++Specifies the color to use for the background of selected (highlighted) text. ++If not specified (i.e., matching the default foreground), reverse video is used. + The default is ``XtDefaultForeground.'' + .TP 8 + .B "highlightSelection (\fPclass\fB HighlightSelection)" +@@ -1951,6 +1993,11 @@ + If you do not wish to have trailing blanks in a selection, + use the \fBtrimSelection\fP resource. + .TP 8 ++.B "highlightTextColor (\fPclass\fB HighlightTextColor)" ++Specifies the color to use for the foreground of selected (highlighted) text. ++If not specified (i.e., matching the default background), reverse video is used. ++The default is ``XtDefaultBackground.'' ++.TP 8 + .B "hpLowerleftBugCompat (\fPclass\fB HpLowerleftBugCompat)" + Specifies whether to work around a bug in HP's \fIxdb\fP, + which ignores termcap and always sends +@@ -1984,6 +2031,11 @@ + is compiled into \fIxterm\fR. + The default is "nil2". + .TP 8 ++.B "initialFont (\fPclass\fB InitialFont)" ++Specifies which of the VT100 fonts to use initially. ++Values are the same as for the \fIset-vt-font\fP action. ++The default is ``d'', i.e., "default". ++.TP 8 + .B "internalBorder (\fPclass\fB BorderWidth)" + Specifies the number of pixels between the characters and the window border. + The default is 2. +@@ -2190,7 +2242,8 @@ + .TP 8 + .B "nMarginBell (\fPclass\fB Column)" + Specifies the number of characters from the right margin at which the margin +-bell should be rung, when enabled. ++bell should be rung, when enabled by the \fBmarginBell\fP resource. ++The default is 10. + .TP 8 + .B "numLock (\fPclass\fB NumLock)" + If ``true'', \fIxterm\fR checks if NumLock is used as a modifier (see \fIxmodmap\fP(1)). +@@ -2273,8 +2326,7 @@ + The default is ``xterm.'' + .TP 8 + .B "popOnBell (\fPclass\fB PopOnBell)" +-Specifies whether the window would be raised when Control-G is +-received. ++Specifies whether the window would be raised when Control-G is received. + The default is ``false.'' + .TP 8 + .B "printAttributes (\fPclass\fB PrintAttributes)" +@@ -2784,12 +2836,12 @@ + .B "visualbell (\fPclass\fB SmeBSB)" + This entry invokes the \fBset-visualbell(toggle)\fP action. + .TP 8 ++.B "bellIsUrgent (\fPclass\fB SmeBSB)" ++This entry invokes the \fBset-bellIsUrgent(toggle)\fP action. ++.TP 8 + .B "poponbell (\fPclass\fB SmeBSB)" + This entry invokes the \fBset-poponbell(toggle)\fP action. + .TP 8 +-.B "marginbell (\fPclass\fB SmeBSB)" +-This entry invokes the \fBset-marginbell(toggle)\fP action. +-.TP 8 + .B "cursorblink (\fPclass\fB SmeBSB)" + This entry invokes the \fBset-cursorblink(toggle)\fP action. + .TP 8 +@@ -2873,7 +2925,7 @@ + The \fItekMenu\fP has the following entries: + .TP 8 + .B "tektextlarge (\fPclass\fB SmeBSB)" +-This entry invokes the \fBset-tek-text(l)\fP action. ++This entry invokes the \fBset-tek-text(large)\fP action. + .TP 8 + .B "tektext2 (\fPclass\fB SmeBSB)" + This entry invokes the \fBset-tek-text(2)\fP action. +@@ -2882,7 +2934,7 @@ + This entry invokes the \fBset-tek-text(3)\fP action. + .TP 8 + .B "tektextsmall (\fPclass\fB SmeBSB)" +-This entry invokes the \fBset-tek-text(s)\fP action. ++This entry invokes the \fBset-tek-text(small)\fP action. + .TP 8 + .B "tekpage (\fPclass\fB SmeBSB)" + This entry invokes the \fBtek-page()\fP action. +@@ -3314,21 +3366,19 @@ + resource. + . + .TP +-Enable Pop on Bell (poponbell) +-Enable (or disable) raising of the window when Control-G is received. ++Enable Bell Urgency (bellIsUrgent) ++Enable (or disable) Urgency window manager hint when Control-G is received. + This corresponds to the +-.B -pop +-option and the +-.B popOnBell ++.B bellIsUrgent + resource. + . + .TP +-Enable Margin Bell (marginbell) +-Enable (or disable) a bell when the user types near the right margin. ++Enable Pop on Bell (poponbell) ++Enable (or disable) raising of the window when Control-G is received. + This corresponds to the +-.B -mb ++.B -pop + option and the +-.B marginBell ++.B popOnBell + resource. + . + .TP +@@ -4004,6 +4054,10 @@ + This action toggles the \fBbackarrowKey\fP resource and is also invoked from the + \fBbackarrow key\fP entry in \fIvtMenu\fP. + .TP 8 ++.B "set-bellIsUrgent(\fIon/off/toggle\fP)" ++This action toggles the \fBbellIsUrgent\fP resource and is also invoked ++by the \fBbellIsUrgent\fP entry in \fIvtMenu\fP. ++.TP 8 + .B "set-cursorblink(\fIon/off/toggle\fP)" + This action toggles the \fBcursorBlink\fP resource and is also invoked from the + \fBcursorblink\fP entry in \fIvtMenu\fP. +@@ -4037,8 +4091,7 @@ + the \fBoldFunctionKeys\fP entry in \fImainMenu\fP. + .TP 8 + .B "set-marginbell(\fIon/off/toggle\fP)" +-This action toggles the \fBmarginBell\fP resource and is also invoked from +-the \fBmarginbell\fP entry in \fIvtMenu\fP. ++This action toggles the \fBmarginBell\fP resource. + .TP 8 + .B "set-num-lock()" + This action toggles the state of the \fBnumLock\fP resource. +@@ -4091,7 +4144,7 @@ + This action sets font used in the Tektronix window to the value of the + resources \fBtektextlarge\fP, \fBtektext2\fP, \fBtektext3\fP, and + \fBtektextsmall\fP according to the argument. +-It is also by the entries ++It is also invoked by the entries + of the same names as the resources in \fItekMenu\fP. + .TP 8 + .B "set-terminal-type(\fItype\fP)" +@@ -4162,6 +4215,21 @@ + \fBsoftreset\fP entry in \fIvtMenu\fP. + The effect is identical to a soft reset (DECSTR) control sequence. + .TP 8 ++.B "spawn-new-terminal(params)" ++Spawn a new \fIxterm\fP process. ++This is available on systems which have a modern version of the ++process filesystem, e.g., "/proc", which \fIxterm\fP can read. ++.IP ++Use the "cwd" process entry, e.g., /proc/12345/cwd to obtain the ++working directory of the process which is running in the current \fIxterm\fP. ++.IP ++On systems which have the "exe" process entry, e.g., /proc/12345/exe, ++use this to obtain the actual executable. ++Otherwise, use the $PATH variable to find \fIxterm\fP. ++.IP ++If parameters are given in the action, ++pass them to the new \fIxterm\fP process. ++.TP 8 + .B "start-extend()" + This action is similar to \fBselect-start\fP except that the + selection is extended to the current pointer location. +@@ -4704,6 +4772,8 @@ + (this is the file ctlseqs.ms). + .sp + http://invisible-island.net/xterm/xterm.html ++.br ++http://invisible-island.net/xterm/ctlseqs/ctlseqs.html + . + . + .SH AUTHORS +Index: xtermcfg.hin +--- xterm-224+/xtermcfg.hin 2007-02-06 22:15:36.000000000 +0000 ++++ xterm-224i/xtermcfg.hin 2007-03-11 18:11:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $XTermId: xtermcfg.hin,v 1.157 2007/02/06 22:15:36 tom Exp $ */ ++/* $XTermId: xtermcfg.hin,v 1.160 2007/03/11 18:11:18 tom Exp $ */ + + /* + * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.61 2006/06/19 00:36:52 dickey Exp $ +@@ -42,6 +42,7 @@ + #undef DFT_DECID /* AC_ARG_WITH(default-terminal-id) */ + #undef DFT_TERMTYPE /* AC_ARG_WITH(default-term-type) */ + #undef DISABLE_SETUID /* CF_ARG_DISABLE(setuid) */ ++#undef DISABLE_SETGID /* CF_ARG_DISABLE(setgid) */ + #undef HAVE_GETHOSTNAME /* AC_CHECK_FUNCS(gethostname) */ + #undef HAVE_GETLOGIN /* AC_CHECK_FUNCS(getlogin) */ + #undef HAVE_LANGINFO_CODESET /* AM_LANGINFO_CODESET */ +@@ -97,6 +98,7 @@ + #undef OPT_DEC_CHRSET /* CF_ARG_DISABLE(doublechars) */ + #undef OPT_DEC_LOCATOR /* CF_ARG_ENABLE(dec-locator) */ + #undef OPT_DEC_RECTOPS /* CF_ARG_ENABLE(rectangles) */ ++#undef OPT_EXEC_XTERM /* CF_ARG_ENABLE(exec-xterm) */ + #undef OPT_HIGHLIGHT_COLOR /* CF_ARG_DISABLE(highlighting) */ + #undef OPT_HP_FUNC_KEYS /* CF_ARG_ENABLE(hp-fkeys) */ + #undef OPT_I18N_SUPPORT /* CF_ARG_DISABLE(i18n) */ +@@ -124,6 +126,7 @@ + #undef OPT_XMC_GLITCH /* CF_ARG_ENABLE(xmc-glitch) */ + #undef OPT_ZICONBEEP /* CF_ARG_DISABLE(ziconbeep) */ + #undef OWN_TERMINFO_DIR /* AC_ARG_WITH(own-terminfo) */ ++#undef PROCFS_ROOT /* CF_ARG_ENABLE(exec-xterm) */ + #undef SCROLLBAR_RIGHT /* CF_ARG_ENABLE(rightbar) */ + #undef SIG_ATOMIC_T /* CF_SIG_ATOMIC_T */ + #undef SVR4 /* CF_SVR4, imake */ diff --git a/xterm.changes b/xterm.changes index 12a69e5..c7d61c4 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 22 17:35:02 CET 2007 - mfabian@suse.de + +- add ftp://invisible-island.net/temp/xterm-224i.patch + (obsoletes fix-fd_option.diff and fixes the redraw problems + for double width characters mentioned in bug #246573). +- adapt patch a little bit to make it build with --with-utempter. + ------------------------------------------------------------------- Mon Feb 26 16:04:31 CET 2007 - sndirsch@suse.de diff --git a/xterm.spec b/xterm.spec index 26fd232..dcb7b2e 100644 --- a/xterm.spec +++ b/xterm.spec @@ -18,7 +18,7 @@ Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm Autoreqprov: on Version: 224 -Release: 5 +Release: 8 Summary: The basic X terminal program Source: %name.tar.gz Source1: luitx @@ -30,10 +30,10 @@ Source6: terminal.png Source7: vttest.tar.gz Source8: 20x20ja.bdf.bz2 Source9: 20x20ko.bdf.bz2 -Patch: fix-fd_option.diff Patch1: p_xterm-settings.diff Patch2: p_xterm-sigwinch.diff Patch3: bug-246573-tentative-patch.diff +Patch4: ftp://invisible-island.net/temp/xterm-224i.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -152,9 +152,9 @@ Authors: %prep %setup -n xterm-%version -b7 -%patch -p1 %patch1 -p0 -b .xterm-settings %patch2 -p0 -b .xterm-sigwinch +%patch4 -p1 %patch3 -p1 cp $RPM_SOURCE_DIR/*bdf.bz2 . bunzip2 *.bdf.bz2 @@ -260,6 +260,11 @@ rm -rf $RPM_BUILD_ROOT /usr/share/pixmaps/terminal.png %changelog +* Thu Mar 22 2007 - mfabian@suse.de +- add ftp://invisible-island.net/temp/xterm-224i.patch + (obsoletes fix-fd_option.diff and fixes the redraw problems + for double width characters mentioned in bug #246573). +- adapt patch a little bit to make it build with --with-utempter. * Mon Feb 26 2007 - sndirsch@suse.de - bug-246573-tentative-patch.diff: * simplify algorithm for verifying that a font contains double