# ------------------------------------------------------------------------------
# README.os390 | 142 ++++++++--------
# aclocal.m4 | 62 ++++++-
# button.c | 38 +---
# charproc.c | 8
# configure | 479 +++++++++++++++++++++++++++++++++----------------------
# ctlseqs.ms | 48 ++---
# main.c | 49 +++--
# os2main.c | 8
# ptyx.h | 11 -
# sinstall.sh | 3
# version.h | 2
# xterm.h | 13 +
# xterm.log.html | 48 +++++
# xterm.man | 13 +
# xtermcfg.hin | 3
# 15 files changed, 583 insertions, 344 deletions
# ------------------------------------------------------------------------------
Index: README.os390
--- xterm-119+/README.os390 Sat Jul 17 20:15:49 1999
+++ xterm-120/README.os390 Tue Oct 26 20:37:31 1999
@@ -1,71 +1,73 @@
-Below are install instructions for os/390 2.5 & below and
-for os/390 2.6 & above. The basic reasons for exporting
-the LIBS and CFLAGS variables is to get the configure
-script to run properly under os/390. configure, when
-checking for X, attempts to compile a program something like
-
- int main() {
- XtMalloc()
- ; return 0; }
-
-using 'cc -o conftest conftest.c -lXt'. However this results
-in a number of linkedit messages such as:
-
- IEW2456E 9207 SYMBOL xcatd UNRESOLVED. MEMBER COULD NOT BE INCLUDED FROM THE
- DESIGNATED CALL LIBRARY. NAME SPACE = 3
- IEW2456E 9207 SYMBOL XrmQGetResource UNRESOLVED. MEMBER COULD NOT BE INCLUDED
- FROM THE DESIGNATED CALL LIBRARY.
- IEW2456E 9207 SYMBOL XrmGetDatabase UNRESOLVED. MEMBER COULD NOT BE INCLUDED
- FROM THE DESIGNATED CALL LIBRARY.
-
-The only way I can get this program to compile and link is to
-use 'cc -o conftest conftest.c -lXt -lX11 -lSM -lICE'.
-With os/390 2.6 and above, IBM has provided X functions in dlls;
-this is the reason for the separate install steps. In fact,
-trying to use the X archive files (eg -lX11) when linking xterm
-results in an abend0C1 in low storage when X tries to call the
-initialize function (at least on my system). This has something
-to do with the calling X routine thinking it has a function pointer
-descriptor (c++) when it actually has just a function pointer (c).
-Unfortunately, I have been unable to recreate the problem in a
-simple testcase, so I haven't reported it to IBM. Anyway, for os/390
-2.6 and above, configure will build a Makefile with the following line:
-
- LIBS = -lXaw -lXext -lXmu -lXt -lSM -lICE -lX11 /usr/lib/Xaw.x /usr/lib/SM.x /usr/lib/ICE.x /usr/lib/X11.x -lcurses
-
-The '-lXaw -lXext -lXmu -lXt -lSM -lICE -lX11' should be manually removed;
-this isn't strictly necessary, but will reduce the size of the executable
-by about 4M.
-
-Good Luck!!
-Greg Smith
-rys@trex.rtpnc.epa.gov
-
-
-
-Install instructions for os/390 2.5 and *below*:
-------------------------------------------------
- gunzip xterm.tar.gz
- pax -o from=ISO8859-1,to=IBM-1047 -rf xterm.tar
- cd xterm
- export LIBS='-lXt -lX11 -lSM -lICE'
- export CFLAGS='-D_ALL_SOURCE'
- ./configure --host=i370-ibm-mvs
- make
- export DISPLAY=my.xserver.name:0
- ./xterm
-
-
-Install instructions for os/390 2.6 and *above*:
-------------------------------------------------
- gunzip xterm.tar.gz
- pax -o from=ISO8859-1,to=IBM-1047 -rf xterm.tar
- cd xterm
- export LIBS='/usr/lib/Xaw.x /usr/lib/SM.x /usr/lib/ICE.x /usr/lib/X11.x'
- export CFLAGS='-O2 -W c,dll -D_ALL_SOURCE'
- ./configure --host=i370-ibm-mvs
- [optional: edit the Makefile and remove '-lXaw -lXext -lXmu -lXt -lSM -lICE -lX11'
- from the LIBS assignment]
- make
- export DISPLAY=my.xserver.name:0
- ./xterm
+-- $XFree86$
+
+Below are install instructions for os/390 2.5 & below and
+for os/390 2.6 & above. The basic reasons for exporting
+the LIBS and CFLAGS variables is to get the configure
+script to run properly under os/390. configure, when
+checking for X, attempts to compile a program something like
+
+ int main() {
+ XtMalloc()
+ ; return 0; }
+
+using 'cc -o conftest conftest.c -lXt'. However this results
+in a number of linkedit messages such as:
+
+ IEW2456E 9207 SYMBOL xcatd UNRESOLVED. MEMBER COULD NOT BE INCLUDED FROM THE
+ DESIGNATED CALL LIBRARY. NAME SPACE = 3
+ IEW2456E 9207 SYMBOL XrmQGetResource UNRESOLVED. MEMBER COULD NOT BE INCLUDED
+ FROM THE DESIGNATED CALL LIBRARY.
+ IEW2456E 9207 SYMBOL XrmGetDatabase UNRESOLVED. MEMBER COULD NOT BE INCLUDED
+ FROM THE DESIGNATED CALL LIBRARY.
+
+The only way I can get this program to compile and link is to
+use 'cc -o conftest conftest.c -lXt -lX11 -lSM -lICE'.
+With os/390 2.6 and above, IBM has provided X functions in dlls;
+this is the reason for the separate install steps. In fact,
+trying to use the X archive files (eg -lX11) when linking xterm
+results in an abend0C1 in low storage when X tries to call the
+initialize function (at least on my system). This has something
+to do with the calling X routine thinking it has a function pointer
+descriptor (c++) when it actually has just a function pointer (c).
+Unfortunately, I have been unable to recreate the problem in a
+simple testcase, so I haven't reported it to IBM. Anyway, for os/390
+2.6 and above, configure will build a Makefile with the following line:
+
+ LIBS = -lXaw -lXext -lXmu -lXt -lSM -lICE -lX11 /usr/lib/Xaw.x /usr/lib/SM.x /usr/lib/ICE.x /usr/lib/X11.x -lcurses
+
+The '-lXaw -lXext -lXmu -lXt -lSM -lICE -lX11' should be manually removed;
+this isn't strictly necessary, but will reduce the size of the executable
+by about 4M.
+
+Good Luck!!
+Greg Smith
+rys@trex.rtpnc.epa.gov
+
+
+
+Install instructions for os/390 2.5 and *below*:
+------------------------------------------------
+ gunzip xterm.tar.gz
+ pax -o from=ISO8859-1,to=IBM-1047 -rf xterm.tar
+ cd xterm
+ export LIBS='-lXt -lX11 -lSM -lICE'
+ export CFLAGS='-D_ALL_SOURCE'
+ ./configure
+ make
+ export DISPLAY=my.xserver.name:0
+ ./xterm
+
+
+Install instructions for os/390 2.6 and *above*:
+------------------------------------------------
+ gunzip xterm.tar.gz
+ pax -o from=ISO8859-1,to=IBM-1047 -rf xterm.tar
+ cd xterm
+ export LIBS='/usr/lib/Xaw.x /usr/lib/SM.x /usr/lib/ICE.x /usr/lib/X11.x'
+ export CFLAGS='-O2 -W c,dll -D_ALL_SOURCE'
+ ./configure
+ [optional: edit the Makefile and remove '-lXaw -lXext -lXmu -lXt -lSM -lICE -lX11'
+ from the LIBS assignment]
+ make
+ export DISPLAY=my.xserver.name:0
+ ./xterm
Index: aclocal.m4
--- xterm-119+/aclocal.m4 Sat Oct 16 09:49:00 1999
+++ xterm-120/aclocal.m4 Thu Oct 28 06:50:41 1999
@@ -629,6 +629,8 @@
[cf_cv_input_method=no])])
])dnl
dnl ---------------------------------------------------------------------------
+dnl Check for header defining _PATH_LASTLOG, or failing that, see if the lastlog
+dnl file exists.
AC_DEFUN([CF_LASTLOG],
[
AC_CHECK_HEADERS(lastlog.h paths.h)
@@ -650,7 +652,8 @@
fi])
])
test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG)
-])dnl
+]
+)dnl
dnl ---------------------------------------------------------------------------
dnl Special test to workaround gcc 2.6.2, which cannot parse C-preprocessor
dnl conditionals.
@@ -812,10 +815,26 @@
#endif
],
[struct $cf_header x;
- char *name = x.ut_name; /* HP-UX 10.x omits this in utmpx.h */
+ char *name = x.ut_name; /* utmp.h and compatible definitions */
+ ],
+ [cf_cv_have_utmp=$cf_header
+ break],
+ [
+ AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <${cf_header}.h>
+#define getutent getutxent
+#ifdef USE_LASTLOG
+#include <lastlog.h> /* may conflict with utmpx.h on Linux */
+#endif
+],
+ [struct $cf_header x;
+ char *name = x.ut_user; /* utmpx.h must declare this */
],
[cf_cv_have_utmp=$cf_header
- break])
+ AC_DEFINE(ut_name,ut_user)
+ break
+ ])])
done
])
@@ -824,6 +843,7 @@
test $cf_cv_have_utmp = utmpx && AC_DEFINE(UTMPX_FOR_UTMP)
CF_UTMP_UT_HOST
CF_UTMP_UT_XTIME
+ CF_UTMP_UT_SESSION
CF_SYSV_UTMP
fi
])
@@ -847,22 +867,50 @@
fi
])
dnl ---------------------------------------------------------------------------
+dnl Check if UTMP/UTMPX struct defines ut_session member
+AC_DEFUN([CF_UTMP_UT_SESSION],
+[
+AC_REQUIRE([CF_UTMP])
+if test $cf_cv_have_utmp != no ; then
+AC_CACHE_CHECK(if utmp.ut_session is declared, cf_cv_have_utmp_ut_session,[
+ AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>],
+ [struct $cf_cv_have_utmp x; long y = x.ut_session],
+ [cf_cv_have_utmp_ut_session=yes],
+ [cf_cv_have_utmp_ut_session=no])
+])
+if test $cf_cv_have_utmp_ut_session != no ; then
+ AC_DEFINE(HAVE_UTMP_UT_SESSION)
+fi
+fi
+])
+dnl ---------------------------------------------------------------------------
dnl Check if UTMP/UTMPX struct defines ut_xtime member
AC_DEFUN([CF_UTMP_UT_XTIME],
[
AC_REQUIRE([CF_UTMP])
if test $cf_cv_have_utmp != no ; then
-AC_MSG_CHECKING(if utmp.ut_xtime is declared)
-AC_CACHE_VAL(cf_cv_have_utmp_ut_xtime,[
+AC_CACHE_CHECK(if utmp.ut_xtime is declared, cf_cv_have_utmp_ut_xtime,[
AC_TRY_COMPILE([
#include <sys/types.h>
#include <${cf_cv_have_utmp}.h>],
[struct $cf_cv_have_utmp x; long y = x.ut_xtime],
[cf_cv_have_utmp_ut_xtime=yes],
+ [AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>],
+ [struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec],
+ [cf_cv_have_utmp_ut_xtime=define],
[cf_cv_have_utmp_ut_xtime=no])
])
-AC_MSG_RESULT($cf_cv_have_utmp_ut_xtime)
-test $cf_cv_have_utmp_ut_xtime != no && AC_DEFINE(HAVE_UTMP_UT_XTIME)
+])
+if test $cf_cv_have_utmp_ut_xtime != no ; then
+ AC_DEFINE(HAVE_UTMP_UT_XTIME)
+ if test $cf_cv_have_utmp_ut_xtime = define ; then
+ AC_DEFINE(ut_xtime,ut_tv.tv_sec)
+ fi
+fi
fi
])
dnl ---------------------------------------------------------------------------
Index: button.c
--- xterm-119+/button.c Wed Oct 6 21:19:22 1999
+++ xterm-120/button.c Tue Oct 26 20:15:39 1999
@@ -79,9 +79,21 @@
#define XTERM_CELL(row,col) getXtermCell(screen, row + screen->topline, col)
-#define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0))
+ /*
+ * We reserve shift modifier for cut/paste operations. In principal we
+ * can pass through control and meta modifiers, but in practice, the
+ * popup menu uses control, and the window manager is likely to use meta,
+ * so those events are not delivered to SendMousePosition.
+ */
+#define OurModifiers (ShiftMask | ControlMask | Mod1Mask)
+#define AllModifiers (ShiftMask | LockMask | ControlMask | Mod1Mask | \
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask)
+
+#define KeyModifiers (event->xbutton.state & OurModifiers)
+
+#define KeyState(x) (((x) & ControlMask) + (((x) & Mod1Mask) ? 2 : 0))
/* adds together the bits:
- shift key -> 1
+ (1 used to be for shift, is now used for buttons 4 and 5)
meta key -> 2
control key -> 4 */
@@ -166,14 +178,6 @@
&& event->type != ButtonRelease)
return False;
-#define KeyModifiers \
- (event->xbutton.state & (ShiftMask | LockMask | ControlMask | Mod1Mask | \
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask ))
-
-#define ButtonModifiers \
- (event->xbutton.state & (ShiftMask | LockMask | ControlMask | Mod1Mask | \
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask ))
-
switch (screen->send_mouse_pos) {
case X10_MOUSE: /* X10 compatibility sequences */
@@ -212,15 +216,10 @@
default:
return False;
}
-#undef KeyModifiers
}
#if OPT_DEC_LOCATOR
-#define KeyModifiers \
- (event->xbutton.state & (ShiftMask | LockMask | ControlMask | Mod1Mask | \
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask ))
-
#define LocatorCoords( row, col, x, y, oor ) \
if( screen->locator_pixels ) { \
(oor)=FALSE; (row) = (y)+1; (col) = (x)+1; \
@@ -372,11 +371,7 @@
return( True );
}
-#undef KeyModifiers
-#define KeyModifiers \
- (mask & (ShiftMask | LockMask | ControlMask | Mod1Mask | \
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask ))
/*
* mask:
* bit 7 bit 6 bit 5 bit 4 bit 3 bit 2 bit 1 bit 0
@@ -422,7 +417,7 @@
LocatorCoords( row, col, x, y, oor );
}
}
- if( ret == FALSE || oor /* || (KeyModifiers != 0 && KeyModifiers != ControlMask) */ )
+ if( ret == FALSE || oor )
{
reply.a_nparam = 1;
reply.a_param[0] = 0; /* Event - 0 = locator unavailable */
@@ -624,7 +619,6 @@
}
}
}
-#undef KeyModifiers
#endif /* OPT_DEC_LOCATOR */
void
@@ -2291,7 +2285,7 @@
static int
BtnCode(XButtonEvent *event, int button)
{
- if (button < 0 || button > 3)
+ if (button < 0 || button > 5)
button = 3;
return ' ' + (KeyState(event->state) << 2) + button;
}
Index: charproc.c
--- xterm-119+/charproc.c Fri Oct 15 19:12:16 1999
+++ xterm-120/charproc.c Sun Oct 24 20:12:34 1999
@@ -842,7 +842,13 @@
register TScreen *screen = &term->screen;
Pixel bg;
- if (screen->scroll_amt)
+ /*
+ * An indexing operation may have set screen->scroll_amt, which would
+ * normally result in calling FlushScroll() in WriteText(). However,
+ * if we're changing the background color now, then the new value
+ * should not apply to the pending blank lines.
+ */
+ if (screen->scroll_amt && (color != term->cur_background))
FlushScroll(screen);
if (color >= 0) {
Index: configure
--- xterm-119+/configure Sat Oct 16 09:49:03 1999
+++ xterm-120/configure Thu Oct 28 06:54:07 1999
@@ -1859,8 +1859,9 @@
+
echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6
-echo "configure:1864: checking for utmp implementation" >&5
+echo "configure:1865: checking for utmp implementation" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1868,7 +1869,7 @@
cf_cv_have_utmp=no
for cf_header in utmpx utmp ; do
cat > conftest.$ac_ext <<EOF
-#line 1872 "configure"
+#line 1873 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1880,17 +1881,50 @@
int main() {
struct $cf_header x;
- char *name = x.ut_name; /* HP-UX 10.x omits this in utmpx.h */
+ char *name = x.ut_name; /* utmp.h and compatible definitions */
; return 0; }
EOF
-if { (eval echo configure:1888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp=$cf_header
break
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <<EOF
+#line 1899 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <${cf_header}.h>
+#define getutent getutxent
+#ifdef USE_LASTLOG
+#include <lastlog.h> /* may conflict with utmpx.h on Linux */
+#endif
+
+int main() {
+struct $cf_header x;
+ char *name = x.ut_user; /* utmpx.h must declare this */
+
+; return 0; }
+EOF
+if { (eval echo configure:1915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_have_utmp=$cf_header
+ cat >> confdefs.h <<\EOF
+#define ut_name ut_user
+EOF
+
+ break
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
fi
rm -f conftest*
done
@@ -1912,13 +1946,13 @@
if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6
-echo "configure:1916: checking if utmp.ut_host is declared" >&5
+echo "configure:1950: checking if utmp.ut_host is declared" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1922 "configure"
+#line 1956 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1927,7 +1961,7 @@
struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
; return 0; }
EOF
-if { (eval echo configure:1931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_host=yes
else
@@ -1951,13 +1985,13 @@
if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6
-echo "configure:1955: checking if utmp.ut_xtime is declared" >&5
+echo "configure:1989: checking if utmp.ut_xtime is declared" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1961 "configure"
+#line 1995 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1966,36 +2000,105 @@
struct $cf_cv_have_utmp x; long y = x.ut_xtime
; return 0; }
EOF
-if { (eval echo configure:1970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_xtime=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
+ cat > conftest.$ac_ext <<EOF
+#line 2012 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>
+int main() {
+struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
+; return 0; }
+EOF
+if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_have_utmp_ut_xtime=define
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
cf_cv_have_utmp_ut_xtime=no
fi
rm -f conftest*
fi
+rm -f conftest*
+
+fi
echo "$ac_t""$cf_cv_have_utmp_ut_xtime" 1>&6
-test $cf_cv_have_utmp_ut_xtime != no && cat >> confdefs.h <<\EOF
+if test $cf_cv_have_utmp_ut_xtime != no ; then
+ cat >> confdefs.h <<\EOF
#define HAVE_UTMP_UT_XTIME 1
EOF
+ if test $cf_cv_have_utmp_ut_xtime = define ; then
+ cat >> confdefs.h <<\EOF
+#define ut_xtime ut_tv.tv_sec
+EOF
+
+ fi
+fi
+fi
+
+
+
+if test $cf_cv_have_utmp != no ; then
+echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6
+echo "configure:2056: checking if utmp.ut_session is declared" >&5
+if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ cat > conftest.$ac_ext <<EOF
+#line 2062 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>
+int main() {
+struct $cf_cv_have_utmp x; long y = x.ut_session
+; return 0; }
+EOF
+if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_have_utmp_ut_session=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_have_utmp_ut_session=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_have_utmp_ut_session" 1>&6
+if test $cf_cv_have_utmp_ut_session != no ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_UTMP_UT_SESSION 1
+EOF
+
+fi
fi
echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6
-echo "configure:1993: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "configure:2096: checking if $cf_cv_have_utmp is SYSV flavor" >&5
if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1999 "configure"
+#line 2102 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2009,7 +2112,7 @@
endutent();
; return 0; }
EOF
-if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_sysv_utmp=yes
else
@@ -2034,14 +2137,14 @@
### checks for structures
echo $ac_n "checking if POSIX VDISABLE symbol should be used""... $ac_c" 1>&6
-echo "configure:2038: checking if POSIX VDISABLE symbol should be used" >&5
+echo "configure:2141: checking if POSIX VDISABLE symbol should be used" >&5
if eval "test \"`echo '$''{'cf_cv_posix_vdisable'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <<EOF
-#line 2045 "configure"
+#line 2148 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -2059,7 +2162,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_posix_vdisable=yes
else
@@ -2071,7 +2174,7 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2075 "configure"
+#line 2178 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -2084,7 +2187,7 @@
int main() { exit(_POSIX_VDISABLE == -1); }
#endif
EOF
-if { (eval echo configure:2088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_posix_vdisable=yes
else
@@ -2110,13 +2213,13 @@
echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:2114: checking if external errno is declared" >&5
+echo "configure:2217: checking if external errno is declared" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2120 "configure"
+#line 2223 "configure"
#include "confdefs.h"
#if HAVE_STDLIB_H
@@ -2129,7 +2232,7 @@
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:2133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'errno'=yes'
else
@@ -2160,13 +2263,13 @@
# It's possible (for near-UNIX clones) that the data doesn't exist
echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:2164: checking if external errno exists" >&5
+echo "configure:2267: checking if external errno exists" >&5
if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2170 "configure"
+#line 2273 "configure"
#include "confdefs.h"
#undef errno
@@ -2176,7 +2279,7 @@
errno = 2
; return 0; }
EOF
-if { (eval echo configure:2180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval 'cf_cv_have_'errno'=yes'
else
@@ -2208,7 +2311,7 @@
echo $ac_n "checking for tty group""... $ac_c" 1>&6
-echo "configure:2212: checking for tty group" >&5
+echo "configure:2315: checking for tty group" >&5
if eval "test \"`echo '$''{'cf_cv_tty_group'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2217,7 +2320,7 @@
cf_cv_tty_group=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 2221 "configure"
+#line 2324 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2231,7 +2334,7 @@
}
EOF
-if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_tty_group=yes
else
@@ -2256,7 +2359,7 @@
### checks for compiler characteristics
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2260: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2363: checking for ${CC-cc} option to accept ANSI C" >&5
if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2280,7 +2383,7 @@
do
CFLAGS="$cf_save_CFLAGS $cf_arg"
cat > conftest.$ac_ext <<EOF
-#line 2284 "configure"
+#line 2387 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2296,7 +2399,7 @@
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:2300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2323,12 +2426,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2327: checking for working const" >&5
+echo "configure:2430: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2332 "configure"
+#line 2435 "configure"
#include "confdefs.h"
int main() {
@@ -2377,7 +2480,7 @@
; return 0; }
EOF
-if { (eval echo configure:2381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2401,12 +2504,12 @@
### checks for system services and user specified options
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2405: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2508: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2410 "configure"
+#line 2513 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2422,7 +2525,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2445,13 +2548,13 @@
echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:2449: checking if we must define _GNU_SOURCE" >&5
+echo "configure:2552: checking if we must define _GNU_SOURCE" >&5
if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2455 "configure"
+#line 2558 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2461,7 +2564,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2471,7 +2574,7 @@
cf_save="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
cat > conftest.$ac_ext <<EOF
-#line 2475 "configure"
+#line 2578 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2481,7 +2584,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2506,7 +2609,7 @@
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:2510: checking for X" >&5
+echo "configure:2613: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -2569,12 +2672,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2573 "configure"
+#line 2676 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2643,14 +2746,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2647 "configure"
+#line 2750 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2750,7 +2853,7 @@
# FIXME: modify the library lookup in autoconf to
# allow _s.a suffix ahead of .a
echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6
-echo "configure:2754: checking for open in -lc_s" >&5
+echo "configure:2857: checking for open in -lc_s" >&5
ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2758,7 +2861,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2762 "configure"
+#line 2865 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2769,7 +2872,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2786,7 +2889,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lc_s $LIBS"
echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6
-echo "configure:2790: checking for gethostname in -lbsd" >&5
+echo "configure:2893: checking for gethostname in -lbsd" >&5
ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2794,7 +2897,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2798 "configure"
+#line 2901 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2805,7 +2908,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2822,7 +2925,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lbsd $LIBS"
echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6
-echo "configure:2826: checking for gethostname in -lnsl_s" >&5
+echo "configure:2929: checking for gethostname in -lnsl_s" >&5
ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2830,7 +2933,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2834 "configure"
+#line 2937 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2841,7 +2944,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2858,7 +2961,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lnsl_s $LIBS"
echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6
-echo "configure:2862: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:2965: checking for XOpenDisplay in -lX11_s" >&5
ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2866,7 +2969,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2870 "configure"
+#line 2973 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2877,7 +2980,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2894,7 +2997,7 @@
echo "$ac_t""yes" 1>&6
LIBS="-lX11_s $LIBS"
echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6
-echo "configure:2898: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:3001: checking for XtAppInitialize in -lXt_s" >&5
ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2902,7 +3005,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2906 "configure"
+#line 3009 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2913,7 +3016,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:2917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2954,7 +3057,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:2958: checking for socket in -lsocket" >&5
+echo "configure:3061: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2962,7 +3065,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2966 "configure"
+#line 3069 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2973,7 +3076,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:2977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3001,7 +3104,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3005: checking for gethostname in -lnsl" >&5
+echo "configure:3108: checking for gethostname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3009,7 +3112,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3013 "configure"
+#line 3116 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3020,7 +3123,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3071,17 +3174,17 @@
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:3075: checking whether -R must be followed by a space" >&5
+echo "configure:3178: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3078 "configure"
+#line 3181 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3097,14 +3200,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3101 "configure"
+#line 3204 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3136,7 +3239,7 @@
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3140: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3243: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3144,7 +3247,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3148 "configure"
+#line 3251 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3155,7 +3258,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3177,7 +3280,7 @@
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3181: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3284: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3185,7 +3288,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3189 "configure"
+#line 3292 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3196,7 +3299,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3225,12 +3328,12 @@
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3229: checking for gethostbyname" >&5
+echo "configure:3332: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3234 "configure"
+#line 3337 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3253,7 +3356,7 @@
; return 0; }
EOF
-if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -3274,7 +3377,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3278: checking for gethostbyname in -lnsl" >&5
+echo "configure:3381: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3282,7 +3385,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3286 "configure"
+#line 3389 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3293,7 +3396,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3323,12 +3426,12 @@
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3327: checking for connect" >&5
+echo "configure:3430: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3332 "configure"
+#line 3435 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3351,7 +3454,7 @@
; return 0; }
EOF
-if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -3372,7 +3475,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3376: checking for connect in -lsocket" >&5
+echo "configure:3479: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3380,7 +3483,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3384 "configure"
+#line 3487 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3391,7 +3494,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:3395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3415,12 +3518,12 @@
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:3419: checking for remove" >&5
+echo "configure:3522: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3424 "configure"
+#line 3527 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3443,7 +3546,7 @@
; return 0; }
EOF
-if { (eval echo configure:3447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -3464,7 +3567,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3468: checking for remove in -lposix" >&5
+echo "configure:3571: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3472,7 +3575,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3476 "configure"
+#line 3579 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3483,7 +3586,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:3487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3507,12 +3610,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3511: checking for shmat" >&5
+echo "configure:3614: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3516 "configure"
+#line 3619 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3535,7 +3638,7 @@
; return 0; }
EOF
-if { (eval echo configure:3539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -3556,7 +3659,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3560: checking for shmat in -lipc" >&5
+echo "configure:3663: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3564,7 +3667,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3568 "configure"
+#line 3671 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3575,7 +3678,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3608,7 +3711,7 @@
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:3612: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3715: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3616,7 +3719,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3620 "configure"
+#line 3723 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3627,7 +3730,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3654,7 +3757,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3658: checking for XOpenDisplay in -lX11" >&5
+echo "configure:3761: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3662,7 +3765,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3666 "configure"
+#line 3769 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3673,7 +3776,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3694,7 +3797,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3698: checking for XtAppInitialize in -lXt" >&5
+echo "configure:3801: checking for XtAppInitialize in -lXt" >&5
ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3702,7 +3805,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3706 "configure"
+#line 3809 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3713,7 +3816,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3769,17 +3872,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3773: checking for $ac_hdr" >&5
+echo "configure:3876: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3778 "configure"
+#line 3881 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3827,7 +3930,7 @@
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:3831: checking for XextCreateExtension in -lXext" >&5
+echo "configure:3934: checking for XextCreateExtension in -lXext" >&5
ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3835,7 +3938,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3839 "configure"
+#line 3942 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3846,7 +3949,7 @@
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:3850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3882,13 +3985,13 @@
if test $cf_path != default ; then
CFLAGS="-I$cf_path/include $cf_save"
echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-echo "configure:3886: checking for $cf_test in $cf_path" >&5
+echo "configure:3989: checking for $cf_test in $cf_path" >&5
else
echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:3889: checking for $cf_test" >&5
+echo "configure:3992: checking for $cf_test" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 3892 "configure"
+#line 3995 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -3897,7 +4000,7 @@
; return 0; }
EOF
-if { (eval echo configure:3901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_result=yes
else
@@ -3923,21 +4026,21 @@
if test $cf_path != default ; then
LIBS="-L$cf_path/lib $cf_lib $LIBS"
echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-echo "configure:3927: checking for $cf_lib in $cf_path" >&5
+echo "configure:4030: checking for $cf_lib in $cf_path" >&5
else
LIBS="$cf_lib $LIBS"
echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-echo "configure:3931: checking for $cf_test in $cf_lib" >&5
+echo "configure:4034: checking for $cf_test in $cf_lib" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 3934 "configure"
+#line 4037 "configure"
#include "confdefs.h"
int main() {
$cf_test()
; return 0; }
EOF
-if { (eval echo configure:3941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -3975,13 +4078,13 @@
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:3979: checking for declaration of fd_set" >&5
+echo "configure:4082: checking for declaration of fd_set" >&5
if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "trying sys/types alone" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 3985 "configure"
+#line 4088 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -3989,7 +4092,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:3993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -3998,7 +4101,7 @@
rm -rf conftest*
echo "trying X11/Xpoll.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4002 "configure"
+#line 4105 "configure"
#include "confdefs.h"
#ifdef HAVE_X11_XPOLL_H
@@ -4008,7 +4111,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=X11/Xpoll.h
else
@@ -4017,7 +4120,7 @@
rm -rf conftest*
echo "trying sys/select.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4021 "configure"
+#line 4124 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4026,7 +4129,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -4060,12 +4163,12 @@
for ac_func in grantpt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4064: checking for $ac_func" >&5
+echo "configure:4167: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4069 "configure"
+#line 4172 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4088,7 +4191,7 @@
; return 0; }
EOF
-if { (eval echo configure:4092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4110,7 +4213,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4114: checking for openpty in -lutil" >&5
+echo "configure:4217: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4118,7 +4221,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4122 "configure"
+#line 4225 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4129,7 +4232,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:4133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4163,7 +4266,7 @@
# Extract the first word of "xterm", so it can be a program name with args.
set dummy xterm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4167: checking for $ac_word" >&5
+echo "configure:4270: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XTERM_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4201,12 +4304,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4205: checking for $ac_func" >&5
+echo "configure:4308: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4210 "configure"
+#line 4313 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4229,7 +4332,7 @@
; return 0; }
EOF
-if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4255,7 +4358,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:4259: checking if we should use imake to help" >&5
+echo "configure:4362: checking if we should use imake to help" >&5
# Check whether --enable-imake or --disable-imake was given.
if test "${enable_imake+set}" = set; then
@@ -4280,7 +4383,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4284: checking for $ac_word" >&5
+echo "configure:4387: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_IMAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4419,7 +4522,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:4423: checking for default terminal-id" >&5
+echo "configure:4526: checking for default terminal-id" >&5
# Check whether --with-terminal-id or --without-terminal-id was given.
if test "${with_terminal_id+set}" = set; then
@@ -4440,7 +4543,7 @@
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:4444: checking for default terminal-type" >&5
+echo "configure:4547: checking for default terminal-type" >&5
# Check whether --with-terminal-type or --without-terminal-type was given.
if test "${with_terminal_type+set}" = set; then
@@ -4457,7 +4560,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:4461: checking for private terminfo-directory" >&5
+echo "configure:4564: checking for private terminfo-directory" >&5
# Check whether --with-own-terminfo or --without-own-terminfo was given.
if test "${with_own_terminfo+set}" = set; then
@@ -4494,7 +4597,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:4498: checking if you want active-icons" >&5
+echo "configure:4601: checking if you want active-icons" >&5
# Check whether --enable-active-icon or --disable-active-icon was given.
if test "${enable_active_icon+set}" = set; then
@@ -4520,7 +4623,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:4524: checking if you want ANSI color" >&5
+echo "configure:4627: checking if you want ANSI color" >&5
# Check whether --enable-ansi-color or --disable-ansi-color was given.
if test "${enable_ansi_color+set}" = set; then
@@ -4546,7 +4649,7 @@
if test $enable_ansi_color = yes ; then
echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6
-echo "configure:4550: checking if you want 16 colors like aixterm" >&5
+echo "configure:4653: checking if you want 16 colors like aixterm" >&5
# Check whether --enable-16-color or --disable-16-color was given.
if test "${enable_16_color+set}" = set; then
@@ -4570,7 +4673,7 @@
echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
-echo "configure:4574: checking if you want 256 colors" >&5
+echo "configure:4677: checking if you want 256 colors" >&5
# Check whether --enable-256-color or --disable-256-color was given.
if test "${enable_256_color+set}" = set; then
@@ -4597,7 +4700,7 @@
else
echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
-echo "configure:4601: checking if you want 88 colors" >&5
+echo "configure:4704: checking if you want 88 colors" >&5
# Check whether --enable-88-color or --disable-88-color was given.
if test "${enable_88_color+set}" = set; then
@@ -4628,7 +4731,7 @@
fi
echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
-echo "configure:4632: checking if you want blinking cursor" >&5
+echo "configure:4735: checking if you want blinking cursor" >&5
# Check whether --enable-blink-cursor or --disable-blink-cursor was given.
if test "${enable_blink_cursor+set}" = set; then
@@ -4654,7 +4757,7 @@
if test $enable_ansi_color = yes ; then
echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6
-echo "configure:4658: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:4761: checking if you want bold colors mapped like IBM PC" >&5
# Check whether --enable-bold-color or --disable-bold-color was given.
if test "${enable_bold_color+set}" = set; then
@@ -4678,7 +4781,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4682: checking if you want color-mode enabled by default" >&5
+echo "configure:4785: checking if you want color-mode enabled by default" >&5
# Check whether --enable-color-mode or --disable-color-mode was given.
if test "${enable_color_mode+set}" = set; then
@@ -4704,7 +4807,7 @@
fi
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:4708: checking if you want support for color highlighting" >&5
+echo "configure:4811: checking if you want support for color highlighting" >&5
# Check whether --enable-highlighting or --disable-highlighting was given.
if test "${enable_highlighting+set}" = set; then
@@ -4728,7 +4831,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:4732: checking if you want support for doublesize characters" >&5
+echo "configure:4835: checking if you want support for doublesize characters" >&5
# Check whether --enable-doublechars or --disable-doublechars was given.
if test "${enable_doublechars+set}" = set; then
@@ -4752,7 +4855,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:4756: checking if you want fallback-support for box characters" >&5
+echo "configure:4859: checking if you want fallback-support for box characters" >&5
# Check whether --enable-boxchars or --disable-boxchars was given.
if test "${enable_boxchars+set}" = set; then
@@ -4776,7 +4879,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:4780: checking if you want support for HP-style function keys" >&5
+echo "configure:4883: checking if you want support for HP-style function keys" >&5
# Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
if test "${enable_hp_fkeys+set}" = set; then
@@ -4802,7 +4905,7 @@
fi
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:4806: checking if you want support for internationalization" >&5
+echo "configure:4909: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -4828,7 +4931,7 @@
fi
echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:4832: checking if you want support for initial-erase setup" >&5
+echo "configure:4935: checking if you want support for initial-erase setup" >&5
# Check whether --enable-initial-erase or --disable-initial-erase was given.
if test "${enable_initial_erase+set}" = set; then
@@ -4854,7 +4957,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:4858: checking if you want support for input-method" >&5
+echo "configure:4961: checking if you want support for input-method" >&5
# Check whether --enable-input-method or --disable-input-method was given.
if test "${enable_input_method+set}" = set; then
@@ -4874,13 +4977,13 @@
echo "$ac_t""$enable_ximp" 1>&6
echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
-echo "configure:4878: checking if X libraries support input-method" >&5
+echo "configure:4981: checking if X libraries support input-method" >&5
if eval "test \"`echo '$''{'cf_cv_input_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4884 "configure"
+#line 4987 "configure"
#include "confdefs.h"
#include <X11/IntrinsicP.h>
@@ -4907,7 +5010,7 @@
; return 0; }
EOF
-if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_input_method=yes
else
@@ -4930,7 +5033,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:4934: checking if you want support for logging" >&5
+echo "configure:5037: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -4954,7 +5057,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:4958: checking if you want to allow logging via a pipe" >&5
+echo "configure:5061: checking if you want to allow logging via a pipe" >&5
# Check whether --enable-logfile-exec or --disable-logfile-exec was given.
if test "${enable_logfile_exec+set}" = set; then
@@ -4981,7 +5084,7 @@
fi
echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:4985: checking if you want support for iconify/maximize translations" >&5
+echo "configure:5088: checking if you want support for iconify/maximize translations" >&5
# Check whether --enable-maximize or --disable-maximize was given.
if test "${enable_maximize+set}" = set; then
@@ -5005,7 +5108,7 @@
echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:5009: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:5112: checking if you want NumLock to override keyboard tables" >&5
# Check whether --enable-num-lock or --disable-num-lock was given.
if test "${enable_num_lock+set}" = set; then
@@ -5029,7 +5132,7 @@
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:5033: checking if you want support for right-scrollbar" >&5
+echo "configure:5136: checking if you want support for right-scrollbar" >&5
# Check whether --enable-rightbar or --disable-rightbar was given.
if test "${enable_rightbar+set}" = set; then
@@ -5055,7 +5158,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:5059: checking if you want check for redundant name-change" >&5
+echo "configure:5162: checking if you want check for redundant name-change" >&5
# Check whether --enable-samename or --disable-samename was given.
if test "${enable_samename+set}" = set; then
@@ -5079,7 +5182,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:5083: checking if you want support for tek4014" >&5
+echo "configure:5186: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -5109,7 +5212,7 @@
fi
echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
-echo "configure:5113: checking if you want pulldown menus with a toolbar" >&5
+echo "configure:5216: checking if you want pulldown menus with a toolbar" >&5
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
@@ -5133,7 +5236,7 @@
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:5137: checking if you want VT52 emulation" >&5
+echo "configure:5240: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -5157,7 +5260,7 @@
echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:5161: checking if you want wide-character support" >&5
+echo "configure:5264: checking if you want wide-character support" >&5
# Check whether --enable-wide-chars or --disable-wide-chars was given.
if test "${enable_wide_chars+set}" = set; then
@@ -5186,7 +5289,7 @@
fi
echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
-echo "configure:5190: checking if you want DECterm Locator support" >&5
+echo "configure:5293: checking if you want DECterm Locator support" >&5
# Check whether --enable-dec-locator or --disable-dec-locator was given.
if test "${enable_dec_locator+set}" = set; then
@@ -5212,7 +5315,7 @@
fi
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:5216: checking if you want -ziconbeep option" >&5
+echo "configure:5319: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -5237,7 +5340,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:5241: checking if you want debugging traces" >&5
+echo "configure:5344: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -5266,7 +5369,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:5270: checking if you want to see long compiling messages" >&5
+echo "configure:5373: checking if you want to see long compiling messages" >&5
# Check whether --enable-echo or --disable-echo was given.
if test "${enable_echo+set}" = set; then
@@ -5306,7 +5409,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:5310: checking if you want magic cookie emulation" >&5
+echo "configure:5413: checking if you want magic cookie emulation" >&5
# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
if test "${enable_xmc_glitch+set}" = set; then
@@ -5335,7 +5438,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:5339: checking if you want to turn on gcc warnings" >&5
+echo "configure:5442: checking if you want to turn on gcc warnings" >&5
# Check whether --enable-warnings or --disable-warnings was given.
if test "${enable_warnings+set}" = set; then
@@ -5375,9 +5478,9 @@
if test -n "$GCC"
then
echo "checking for gcc __attribute__ directives" 1>&6
-echo "configure:5379: checking for gcc __attribute__ directives" >&5
+echo "configure:5482: checking for gcc __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 5381 "configure"
+#line 5484 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -5415,7 +5518,7 @@
EOF
;;
esac
- if { (eval echo configure:5419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
cat conftest.h >>confdefs.h
# else
@@ -5432,11 +5535,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 5436 "configure"
+#line 5539 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for gcc warning options" 1>&6
-echo "configure:5440: checking for gcc warning options" >&5
+echo "configure:5543: checking for gcc warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -5454,7 +5557,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:5458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
Index: ctlseqs.ms
--- xterm-119+/ctlseqs.ms Fri Oct 15 06:18:29 1999
+++ xterm-120/ctlseqs.ms Wed Oct 27 18:43:21 1999
@@ -1356,18 +1356,16 @@
information on button presses. These modes are typically used by
editors and other full-screen applications that want to make use of
the mouse.
-.
-.LP
+
There are six mutually exclusive modes. One is DEC Locator mode, enabled by the
DECELR \*(Cs\*(Ps\*s\*;\*(Ps\*s\*s\*'\*s\*z
control sequence, and is not described here. The remaining five
-modes are each enabled (or disabled) by a different parameter in
+modes are each enabled (or disabled) by a different parameter in
DECSET \*(Cs\*?\*(Pm\*s\*h
or
DECRST \*(Cs\*?\*(Pm\*s\*l
control sequence.
-.
-.LP
+
Manifest constants for the parameter values
are defined in \fBxcharmouse.h\fP as follows:
.
@@ -1382,15 +1380,14 @@
The motion reporting modes are strictly \fIxterm\fP extensions, and are not
part of any standard, though they are analogous to the DEC VT200 DECELR
locator reports.
-.LP
+
Parameters (such as pointer position and button number) for all mouse
tracking escape sequences generated by \fIxterm\fP
encode numeric parameters in a single character as
\fIvalue\fP+32.
For example, \*! specifies the value 1.
The upper left character position on the terminal is denoted as 1,1.
-.
-.LP
+
X10 compatibility mode sends an escape sequence only on button press,
encoding the location and the mouse button pressed.
It is enabled by specifying parameter 9 to DECSET.
@@ -1399,21 +1396,28 @@
\*(Cb is button\-1.
\*(Cx and \*(Cy are the x and y coordinates of the mouse when the
button was pressed.
-.
-.LP
+
Normal tracking mode sends an escape sequence on both button press and
release. Modifier key (shift, ctrl, meta) information is also sent.
It is enabled by specifying parameter 1000 to DECSET.
On button press or release, \fIxterm\fP sends
\*(Cs\*M\*(Cb\*(Cx\*(Cy.
-The low two bits of \*(Cb encode button information:
-0=MB1 pressed, 1=MB2 pressed, 2=MB3 pressed, 3=release.
-The upper bits encode the modifiers which were down when the button was
-pressed and are added together. 4=Shift, 8=Meta, 16=Control.
-\*(Cx and \*(Cy are the x and y coordinates of the mouse event.
-The upper left corner is (1,1).
-.
-.LP
+The low three bits of \*(Cb encode button information:
+0=MB1 pressed, 1=MB2 pressed, 2=MB3 pressed, 3=release,
+4=MB4 pressed, 5=MB5 pressed.
+The next two bits are reserved for future use, i.e., sending
+state information on the Meta and Control modifiers which are in effect
+when the button is pressed.
+.\" The upper bits encode the modifiers which were down when the button was
+.\" pressed and are added together: 4=Shift, 8=Meta, 16=Control.
+.\" Note however that the shift and control bits are normally unavailable
+.\" because \fIxterm\fP uses the control modifier with mouse for popup menus,
+.\" and the shift modifier is used in the default translations for button events.
+.\" The \fIMeta\fP modifier recognized by \fIxterm\fP is the \fImod1\fP mask,
+.\" and is not necessarily the "Meta" key (see \fIxmodmap\fP).
+\*(Cx and \*(Cy are the x and y coordinates of the mouse event, encoded as
+in X10 mode.
+
Mouse hilite tracking notifies a program of a button press, receives a
range of lines from the program, highlights the region covered by
the mouse within that range until button release, and then sends the
@@ -1445,14 +1449,13 @@
ending character positions of the region. \fImousex\fP and \fImousey\fP
give the location of the mouse at button up, which may not be over a
character.
-.
-.LP
+
Button-event tracking is essentially the same as normal tracking, but
\fIxterm\fP also reports button-motion events. Motion events
are reported only if the mouse pointer has moved to a different character
cell. It is enabled by specifying parameter 1002 to DECSET.
On button press or release, \fIxterm\fP sends the same codes used by normal
-tracking mode. On button-motion events, \fIxterm\fP adds 4 to the event code
+tracking mode. On button-motion events, \fIxterm\fP adds 32 to the event code
(the third character, \*(Cb).
The low two bits of the event code encode the button information.
The third bit is set to indicate motion.
@@ -1463,8 +1466,7 @@
Similarly, motion with button 3
down is reported as \*(Cs\*M\*(cB\*(Cx\*(Cy.
( \*(cB = 32 + 2 (button 3) + 32 (motion indicator) ).
-.
-.LP
+
Any-event mode is the same as button-event mode, except that all motion
events are reported instead of just those that enter a new character cell.
It is enabled by specifying 1003 to DECSET.
Index: main.c
--- xterm-119+/main.c Fri Oct 15 06:19:17 1999
+++ xterm-120/main.c Thu Oct 28 06:53:26 1999
@@ -183,9 +183,6 @@
#define USE_USG_PTYS
#define USE_SYSV_PGRP
#define USE_SYSV_SIGNALS
-#define HAVE_UTMP
-#define ut_name ut_user
-#define ut_xtime ut_tv.tv_sec
#undef HAS_LTCHARS
#endif
@@ -511,6 +508,7 @@
#endif
extern int tgetent (char *ptr, char *name);
+extern char *tgetstr (char *name, char **ptr);
#ifdef __cplusplus
}
@@ -548,7 +546,7 @@
#endif
#endif /* USE_SYSV_TERMIO */
-#define TERMCAP_ERASE "kb="
+#define TERMCAP_ERASE "kb"
#define VAL_INITIAL_ERASE A2E(127)
/* allow use of system default characters if defined and reasonable */
@@ -759,6 +757,7 @@
char *tty_modes;
Boolean hold_screen; /* true if we keep window open */
Boolean utmpInhibit;
+ Boolean messages;
Boolean sunFunctionKeys; /* %%% should be widget resource? */
#if OPT_SUNPC_KBD
Boolean sunKeyboard;
@@ -805,6 +804,8 @@
offset(hold_screen), XtRString, "false"},
{"utmpInhibit", "UtmpInhibit", XtRBoolean, sizeof (Boolean),
offset(utmpInhibit), XtRString, "false"},
+ {"messages", "Messages", XtRBoolean, sizeof (Boolean),
+ offset(messages), XtRString, "true"},
{"sunFunctionKeys", "SunFunctionKeys", XtRBoolean, sizeof (Boolean),
offset(sunFunctionKeys), XtRString, "false"},
#if OPT_SUNPC_KBD
@@ -896,8 +897,8 @@
{"-hf", "*hpKeyboard", XrmoptionNoArg, (caddr_t) "on"},
{"+hf", "*hpKeyboard", XrmoptionNoArg, (caddr_t) "off"},
#endif
-{"-hold", "*hold", XrmoptionNoArg, (caddr_t) "on"},
-{"+hold", "*hold", XrmoptionNoArg, (caddr_t) "off"},
+{"-hold", "*hold", XrmoptionNoArg, (caddr_t) "on"},
+{"+hold", "*hold", XrmoptionNoArg, (caddr_t) "off"},
#if OPT_INITIAL_ERASE
{"-ie", "*ptyInitialErase", XrmoptionNoArg, (caddr_t) "on"},
{"+ie", "*ptyInitialErase", XrmoptionNoArg, (caddr_t) "off"},
@@ -913,6 +914,8 @@
{"-mb", "*marginBell", XrmoptionNoArg, (caddr_t) "on"},
{"+mb", "*marginBell", XrmoptionNoArg, (caddr_t) "off"},
{"-mc", "*multiClickTime", XrmoptionSepArg, (caddr_t) NULL},
+{"-mesg", "*messages", XrmoptionNoArg, (caddr_t) "off"},
+{"+mesg", "*messages", XrmoptionNoArg, (caddr_t) "on"},
{"-ms", "*pointerColor",XrmoptionSepArg, (caddr_t) NULL},
{"-nb", "*nMarginBell", XrmoptionSepArg, (caddr_t) NULL},
{"-nul", "*underLine", XrmoptionNoArg, (caddr_t) "off"},
@@ -1042,6 +1045,7 @@
{ "-/+ls", "turn on/off login shell" },
{ "-/+mb", "turn on/off margin bell" },
{ "-mc milliseconds", "multiclick time in milliseconds" },
+{ "-/+mesg", "forbid/allow messages" },
{ "-ms color", "pointer color" },
{ "-nb number", "margin bell in characters from right end" },
{ "-/+nul", "turn on/off display of underlining" },
@@ -2443,7 +2447,7 @@
#endif /* USE_SYSV_TERMIO */
}
if (resource.backarrow_is_erase)
- if (initial_erase == 0177) { /* see input.c */
+ if (initial_erase == 127) { /* see input.c */
term->keyboard.flags &= ~MODE_DECBKM;
}
TRACE(("%s @%d, ptyInitialErase:%d, backspace_is_erase:%d, initial_erase:%d\n",
@@ -2563,16 +2567,16 @@
__FILE__, __LINE__,
resource.ptyInitialErase,
resource.backarrow_is_erase))
- if (!resource.ptyInitialErase && *newtc) {
- char *s = strstr(newtc, TERMCAP_ERASE);
+ if (!resource.ptyInitialErase) {
+ char temp[1024], *p = temp;
+ char *s = tgetstr(TERMCAP_ERASE, &p);
TRACE(("extracting initial_erase value from termcap\n"))
if (s != 0) {
- s += 3;
if (*s == '^') {
if (*++s == '?') {
initial_erase = 127;
} else {
- initial_erase = *s & 31;
+ initial_erase = CONTROL(*s);
}
} else if (*s == '\\') {
char *d;
@@ -2583,8 +2587,12 @@
initial_erase = *s;
}
initial_erase = CharOf(initial_erase);
+ TRACE(("... initial_erase:%d\n", initial_erase))
}
- TRACE(("... initial_erase:%d\n", initial_erase))
+ }
+ if (resource.backarrow_is_erase && initial_erase == 127) {
+ /* see input.c */
+ term->keyboard.flags &= ~MODE_DECBKM;
}
#endif
@@ -2820,17 +2828,20 @@
struct group *ttygrp;
if ((ttygrp = getgrnam("tty")) != 0) {
/* change ownership of tty to real uid, "tty" gid */
- set_owner (ttydev, screen->uid, ttygrp->gr_gid, 0620);
+ set_owner (ttydev, screen->uid, ttygrp->gr_gid,
+ (resource.messages? 0620 : 0600));
}
else {
/* change ownership of tty to real group and user id */
- set_owner (ttydev, screen->uid, screen->gid, 0622);
+ set_owner (ttydev, screen->uid, screen->gid,
+ (resource.messages? 0622 : 0600));
}
endgrent();
}
#else /* else !USE_TTY_GROUP */
/* change ownership of tty to real group and user id */
- set_owner (ttydev, screen->uid, screen->gid, 0622);
+ set_owner (ttydev, screen->uid, screen->gid,
+ (resource.messages? 0622 : 0600));
#endif /* USE_TTY_GROUP */
/*
@@ -3314,7 +3325,7 @@
utmp.ut_pid = getpid();
#if defined(HAVE_UTMP_UT_XTIME)
-#ifndef __MVS__
+#if defined(HAVE_UTMP_UT_SESSION)
utmp.ut_session = getsid(0);
#endif
utmp.ut_xtime = time ((time_t *) 0);
@@ -3521,8 +3532,8 @@
}
#if OPT_INITIAL_ERASE
if (*newtc) {
- remove_termcap_entry (newtc, TERMCAP_ERASE);
- sprintf(newtc + strlen(newtc), ":%s\\%03o", TERMCAP_ERASE, initial_erase & 0377);
+ remove_termcap_entry (newtc, TERMCAP_ERASE "=");
+ sprintf(newtc + strlen(newtc), ":%s=\\%03o", TERMCAP_ERASE, initial_erase & 0377);
}
#endif
if(*newtc)
@@ -4123,7 +4134,7 @@
if (utptr && (utptr->ut_pid == screen->pid)) {
utptr->ut_type = DEAD_PROCESS;
#if defined(HAVE_UTMP_UT_XTIME)
-#ifndef __MVS__
+#if defined(HAVE_UTMP_UT_SESSION)
utptr->ut_session = getsid(0);
#endif
utptr->ut_xtime = time ((time_t *) 0);
Index: os2main.c
--- xterm-119+/os2main.c Mon Sep 27 16:12:18 1999
+++ xterm-120/os2main.c Wed Oct 27 18:57:19 1999
@@ -235,6 +235,7 @@
char *term_name;
char *tty_modes;
Boolean utmpInhibit;
+ Boolean messages;
Boolean sunFunctionKeys; /* %%% should be widget resource? */
#if OPT_SUNPC_KBD
Boolean sunKeyboard;
@@ -275,6 +276,8 @@
offset(tty_modes), XtRString, (caddr_t) NULL},
{"utmpInhibit", "UtmpInhibit", XtRBoolean, sizeof (Boolean),
offset(utmpInhibit), XtRString, "false"},
+ {"messages", "Messages", XtRBoolean, sizeof (Boolean),
+ offset(messages), XtRString, "true"},
{"sunFunctionKeys", "SunFunctionKeys", XtRBoolean, sizeof (Boolean),
offset(sunFunctionKeys), XtRString, "false"},
#if OPT_SUNPC_KBD
@@ -371,6 +374,8 @@
{"-mb", "*marginBell", XrmoptionNoArg, (caddr_t) "on"},
{"+mb", "*marginBell", XrmoptionNoArg, (caddr_t) "off"},
{"-mc", "*multiClickTime", XrmoptionSepArg, (caddr_t) NULL},
+{"-mesg", "*messages", XrmoptionNoArg, (caddr_t) "off"},
+{"+mesg", "*messages", XrmoptionNoArg, (caddr_t) "on"},
{"-ms", "*pointerColor",XrmoptionSepArg, (caddr_t) NULL},
{"-nb", "*nMarginBell", XrmoptionSepArg, (caddr_t) NULL},
{"-nul", "*underLine", XrmoptionNoArg, (caddr_t) "off"},
@@ -496,6 +501,7 @@
{ "-/+ls", "turn on/off login shell" },
{ "-/+mb", "turn on/off margin bell" },
{ "-mc milliseconds", "multiclick time in milliseconds" },
+{ "-/+mesg", "forbid/allow messages" },
{ "-ms color", "pointer color" },
{ "-nb number", "margin bell in characters from right end" },
{ "-/+nul", "turn on/off display of underlining" },
@@ -1517,7 +1523,7 @@
chown (ttydev, screen->uid, screen->gid);
/* change protection of tty */
- chmod (ttydev, 0622);
+ chmod (ttydev, (resource.messages? 0622 : 0600));
/* for the xf86sup-pty, we set the pty to bypass: OS/2 does
* not have a line discipline structure
Index: ptyx.h
--- xterm-119+/ptyx.h Fri Oct 15 06:20:41 1999
+++ xterm-120/ptyx.h Tue Oct 26 19:35:46 1999
@@ -91,17 +91,6 @@
#undef interval
#endif
-/* Extra Xlib definitions */
-#define AllButtonsUp(detail, ignore) (\
- ((ignore) == Button1) ? \
- (((detail)&(Button2Mask|Button3Mask)) == 0) \
- : \
- (((ignore) == Button2) ? \
- (((detail)&(Button1Mask|Button3Mask)) == 0) \
- : \
- (((detail)&(Button1Mask|Button2Mask)) == 0)) \
- )
-
/*
** System V definitions
*/
Index: sinstall.sh
--- xterm-119+/sinstall.sh Fri Oct 15 06:17:32 1999
+++ xterm-120/sinstall.sh Wed Oct 27 18:23:39 1999
@@ -74,10 +74,11 @@
fi
if test -n "${PROG_USR}${PROG_GRP}" ; then
+ cf_uid=`id | sed -e 's/^[^=]*=//' -e 's/(.*$//'`
cf_usr=`id | sed -e 's/^[^(]*(//' -e 's/).*$//'`
cf_grp=`id | sed -e 's/^.* gid=[^(]*(//' -e 's/).*$//'`
$trace "... installing $NEW_PROG as user \"$cf_usr\", group \"$cf_grp\""
- if test "$cf_usr" != "root" ; then
+ if test "$cf_uid" != 0 ; then
PROG_MODE=755
PROG_USR=""
PROG_GRP=""
Index: version.h
--- xterm-119+/version.h Fri Oct 15 06:21:24 1999
+++ xterm-120/version.h Mon Oct 25 20:18:02 1999
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 119
+#define XTERM_PATCH 120
#define XFREE86_VERSION "XFree86 3.9.16c"
Index: xterm.h
--- xterm-119+/xterm.h Fri Oct 15 06:21:03 1999
+++ xterm-120/xterm.h Thu Oct 28 06:52:45 1999
@@ -88,11 +88,17 @@
#define HAVE_UTMP 1
#endif
-#if (defined(SVR4) || defined(SCO325)) && !defined(__CYGWIN__)
+#if (defined(__MVS__) || defined(SVR4) || defined(SCO325)) && !defined(__CYGWIN__)
#define UTMPX_FOR_UTMP 1
#endif
+#ifndef ISC
#define HAVE_UTMP_UT_HOST 1
+#endif
+
+#if defined(UTMPX_FOR_UTMP) && !(defined(__MVS__) || defined(__hpux))
+#define HAVE_UTMP_UT_SESSION 1
+#endif
#if defined(SVR4) || defined(SCO325) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)))
#define HAVE_UTMP_UT_XTIME 1
@@ -111,6 +117,11 @@
#if defined(__GNU__) || defined(__MVS__)
#define USE_TTY_GROUP
+#endif
+
+#if defined(__MVS__)
+#define ut_name ut_user
+#define ut_xtime ut_tv.tv_sec
#endif
#endif /* HAVE_CONFIG_H */
Index: xterm.log.html
--- xterm-119+/xterm.log.html Sat Oct 16 22:31:20 1999
+++ xterm-120/xterm.log.html Thu Oct 28 06:55:51 1999
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_120">Patch #120 - 1999/10/28 - XFree86 3.9.16c</A>
<LI><A HREF="#xterm_119">Patch #119 - 1999/10/16 - XFree86 3.9.16c</A>
<LI><A HREF="#xterm_118">Patch #118 - 1999/10/5 - XFree86 3.9.16b</A>
<LI><A HREF="#xterm_117">Patch #117 - 1999/9/29 - XFree86 3.9.16b</A>
@@ -162,6 +163,53 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_120">Patch #120 - 1999/10/28 - XFree86 3.9.16c</A></H1>
+<ul>
+ <li>refine the change to <code>SGR_Background()</code> in patch #119,
+ by not flushing the pending scrolling operation if the background
+ color is not actually changing. This combination occurs when using
+ color-ls to display a long listing, since each line ends with an SGR0
+ which affects only the foreground color. The unnecessary flushing
+ made it noticeably slower (reported by D Roland Walker
+ <walker@pobox.com>).
+
+ <li>remove obsolete documentation about modifiers which can be returned
+ in mouse tracking mode, and modify logic to ignore modifiers other
+ than the existing ones, e.g., NumLock (prompted by discussions with
+ Christian Weisgerber and Brad Pepers <brad@linuxcanada.com>).
+
+ <li>use free bit from obsolete shift-modifier coding of mouse tracking
+ button events to encode buttons 4 and 5, e.g., for a wheel mouse
+ (requests by Brad Pepers and Bram Moolenaar).
+
+ <li>correct a place where the ptyInitialErase logic did not set the
+ backarrowKey state, and modify it further to use tgetstr() rather
+ than parse the termcap data returned from tgetent() so the
+ ptyInitialErase logic will work when xterm is linked with a terminfo
+ library (based on a patch by Dr Werner Fink <werner@suse.de>).
+
+ <li>fix definition of HAVE_UTMP_UT_HOST for ISC configuration (patch by
+ <michael.rohleder@stadt-frankfurt.de>)
+
+ <li>improve configure script's utmp tests (based on reports by Greg
+ Smith for os390, and David Ellement for HPUX).
+
+ <li>modify sinstall.sh to use uid=0 rather than 'root' to determine if
+ the installer is privileged. This is needed on some systems since
+ more than one account may be privileged (report by Greg Smith).
+
+ <li>add an application resource, <code>messages</code> (and a
+ corresponding -/+mesg option) which controls the initial permission
+ on the terminal: if messages is set to true (the default), behavior
+ is as without the patch; if it is set to false (as per -mesg), the
+ terminal is opened in mode 0600, thus producing the effect of the
+ <code>mesg n</code> command. This is useful for users who want to
+ redirect all their messages to one particular xterm: it is more
+ pleasant to do this with xterm resources than with explicit calls to
+ the <code>mesg</code> program (patch, description by David Madore
+ <madore@clipper.ens.fr>).
+</ul>
<H1><A NAME="xterm_119">Patch #119 - 1999/10/16 - XFree86 3.9.16c</A></H1>
<ul>
Index: xterm.man
--- xterm-119+/xterm.man Fri Oct 15 05:56:55 1999
+++ xterm-120/xterm.man Wed Oct 27 19:00:33 1999
@@ -417,6 +417,14 @@
.B "\-mc milliseconds"
This option specifies the maximum time between multi-click selections.
.TP 8
+.B \-mesg
+Turn off the \fBmessages\fP resource, i.e.,
+disallow write access to the terminal.
+.TP 8
+.B \+mesg
+Turn on the \fBmessages\fP resource, i.e.,
+allow write access to the terminal.
+.TP 8
.BI \-ms " color"
This option specifies the color to be used for the pointer cursor. The default
is to use the foreground color.
@@ -737,6 +745,11 @@
.TP 8
.B "iconName (\fPclass\fB IconName)"
Specifies the icon name. The default is the application name.
+.TP 8
+.B "messages (\fPclass\fB Messages)"
+Specifies whether write access to the terminal is allowed initially. See
+.BR mesg (1).
+The default is ``true''.
.TP 8
.B "ptyInitialErase (\fPclass\fB PtyInitialErase)"
If ``true'', \fIxterm\fP will use the pseudo-terminal's sense of the stty erase
Index: xtermcfg.hin
--- xterm-119+/xtermcfg.hin Fri Oct 15 06:17:46 1999
+++ xterm-120/xtermcfg.hin Thu Oct 28 06:53:43 1999
@@ -51,6 +51,7 @@
#undef HAVE_UNISTD_H /* AC_CHECK_HEADERS(unistd.h) */
#undef HAVE_UTMP /* CF_UTMP */
#undef HAVE_UTMP_UT_HOST /* CF_UTMP_UT_HOST */
+#undef HAVE_UTMP_UT_SESSION /* CF_UTMP_UT_SESSION */
#undef HAVE_UTMP_UT_XTIME /* CF_UTMP_UT_XTIME */
#undef HAVE_WAITPID /* AC_CHECK_FUNCS(waitpid) */
#undef HAVE_X11_DECKEYSYM_H /* AC_CHECK_HEADERS(X11/DECkeysym.h) */
@@ -93,6 +94,8 @@
#undef UTMPX_FOR_UTMP /* CF_UTMP */
#undef const /* AC_CONST */
#undef size_t /* AC_TYPE_SIZE_T */
+#undef ut_name /* CF_UTMP */
+#undef ut_xtime /* CF_UT_XTIME */
#undef time_t /* AC_CHECK_TYPE(time_t, long) */
#undef GCC_PRINTF