# ------------------------------------------------------------------------------
# INSTALL | 4
# Imakefile | 11 -
# MANIFEST | 2
# XTerm.ad | 1
# aclocal.m4 | 4
# charproc.c | 25 +-
# configure | 579 ++++++++++++++++++++++++++++---------------------------
# configure.in | 10
# ctlseqs.ms | 3
# fontutils.c | 8
# input.c | 69 ++++++
# main.c | 2
# menu.c | 43 +++-
# menu.h | 19 +
# misc.c | 15 +
# ptyx.h | 1
# screen.c | 3
# scrollbar.c | 29 +-
# sinstall.sh | 2
# util.c | 7
# version.h | 2
# xterm.log.html | 30 ++
# xterm.man | 54 +++--
# xtermcfg.hin | 1
# 24 files changed, 594 insertions, 330 deletions
# ------------------------------------------------------------------------------
Index: INSTALL
--- xterm-129+/INSTALL Tue Jan 25 01:45:01 2000
+++ xterm-130/INSTALL Tue Feb 29 21:58:18 2000
@@ -218,6 +218,10 @@
Logging was disabled in X11R5 xterm because of security problems.
They were addressed in X11R6, but the feature was not reinstated.
+ --enable-sco-fkeys enable support for SCO-style function keys
+
+ Compile-in code to support SCO-style function keys.
+
--enable-toolbar enable pulldown menus on toolbar
Compile-in code that builds a toolbar with pulldown menus. The
Index: Imakefile
--- xterm-129+/Imakefile Tue Jan 25 01:45:01 2000
+++ xterm-130/Imakefile Tue Feb 29 20:50:42 2000
@@ -61,12 +61,17 @@
PTYLIB = -lutil
#endif
+#ifdef OS2Architecture
+/*
+ * Only used in os2main.c, see ptyx.h for OPT_I18N_SUPPORT
+ * <werner@suse.de>
+ */
#if XtermWithI18N
I18NDEF = -DI18N
-#endif
-
-#ifdef OS2Architecture
+ FEATURE_DEFINES = -DDEBUG -DALLOWLOGGING $(I18NDEF)
+#else
FEATURE_DEFINES = -DDEBUG -DALLOWLOGGING
+#endif
#endif
OSMAJORVERSION = OSMajorVersion
Index: MANIFEST
--- xterm-129+/MANIFEST Thu Feb 17 17:33:19 2000
+++ xterm-130/MANIFEST Wed Mar 1 06:09:34 2000
@@ -1,4 +1,4 @@
-MANIFEST for xterm-128, version xterm-128
+MANIFEST for xterm-130, version xterm-130
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
Index: XTerm.ad
--- xterm-129+/XTerm.ad Sun Feb 13 08:01:12 2000
+++ xterm-130/XTerm.ad Wed Mar 1 05:36:39 2000
@@ -83,6 +83,7 @@
*fontMenu*fontescape*Label: Escape Sequence
*fontMenu*fontsel*Label: Selection
!fontescape and fontsel overridden by application
+*fontMenu*font-linedrawing*Label: Line-Drawing Characters
*fontMenu*font-doublesize*Label: Doublesized Characters
*fontMenu*font-loadable*Label: VT220 Soft Fonts
Index: aclocal.m4
--- xterm-129+/aclocal.m4 Tue Jan 25 01:45:01 2000
+++ xterm-130/aclocal.m4 Wed Mar 1 21:15:55 2000
@@ -613,9 +613,9 @@
],[
{
XIM xim;
- XIMStyles *xim_styles;
+ XIMStyles *xim_styles = 0;
XIMStyle input_style;
- Widget w;
+ Widget w = 0;
XSetLocaleModifiers("@im=none");
xim = XOpenIM(XtDisplay(w), NULL, NULL, NULL);
Index: charproc.c
--- xterm-129+/charproc.c Wed Mar 1 02:22:43 2000
+++ xterm-130/charproc.c Wed Mar 1 06:29:39 2000
@@ -251,16 +251,16 @@
! @Num_Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
~Ctrl ~Meta <Btn3Down>:start-extend() \n\
~Meta <Btn3Motion>:select-extend() \n\
- Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
- Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
- Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
- @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
- <Btn4Down>:scroll-back(5,line) \n\
- Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
- Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
- Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
- @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
- <Btn5Down>:scroll-forw(5,line) \n\
+ Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ <Btn4Down>:scroll-back(5,line,m) \n\
+ Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ <Btn5Down>:scroll-forw(5,line,m) \n\
<BtnUp>:select-end(PRIMARY, CUT_BUFFER0) \n\
<BtnDown>:bell(0) \
"; /* PROCURA added "Meta <Btn2Down>:clear-saved-lines()" */
@@ -328,6 +328,9 @@
#if OPT_BLINK_CURS
{ "set-cursorblink", HandleCursorBlink },
#endif
+#if OPT_BOX_CHARS
+ { "set-font-linedrawing", HandleFontBoxChars },
+#endif
#if OPT_DEC_CHRSET
{ "set-font-doublesize", HandleFontDoublesize },
#endif
@@ -3291,7 +3294,7 @@
#endif
#if OPT_SCO_FUNC_KEYS
case 1053:
- set_keyboard_type(keyboardIsHP, func == bitset);
+ set_keyboard_type(keyboardIsSCO, func == bitset);
break;
#endif
case 1060:
Index: configure
--- xterm-129+/configure Tue Jan 25 01:45:01 2000
+++ xterm-130/configure Wed Mar 1 21:34:24 2000
@@ -205,13 +205,14 @@
--disable-doublechars disable support for double-size chars
--disable-boxchars disable fallback-support for box chars
--enable-hp-fkeys enable support for HP-style function keys
+ --enable-sco-fkeys enable support for SCO-style function keys
--disable-i18n disable internationalization
--disable-initial-erase disable setup for stty erase
--disable-input-method disable input-method
--enable-logging enable logging
- --enable-logfile-exec enable exec'd logfile filter
EOF
cat <<EOF
+ --enable-logfile-exec enable exec'd logfile filter
--disable-maximize disable actions for iconify/deiconify/maximize/restore
--disable-num-lock disable NumLock keypad support
--disable-rightbar disable right-scrollbar support
@@ -223,9 +224,9 @@
--enable-dec-locator enable DECterm Locator support
--disable-ziconbeep disable -ziconbeep option
--enable-trace test: set to enable debugging traces
- --disable-echo display "compiling" commands
EOF
cat <<EOF
+ --disable-echo display "compiling" commands
--enable-xmc-glitch test: enable xmc magic-cookie emulation
--enable-warnings test: turn on GCC compiler warnings
EOF
@@ -595,7 +596,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:599: checking host system type" >&5
+echo "configure:600: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -646,7 +647,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:650: checking for $ac_word" >&5
+echo "configure:651: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -676,7 +677,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:680: checking for $ac_word" >&5
+echo "configure:681: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -727,7 +728,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:731: checking for $ac_word" >&5
+echo "configure:732: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -759,7 +760,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -770,12 +771,12 @@
cat > conftest.$ac_ext << EOF
-#line 774 "configure"
+#line 775 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -801,12 +802,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:805: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:806: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:810: checking whether we are using GNU C" >&5
+echo "configure:811: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -815,7 +816,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -834,7 +835,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:838: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:839: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -866,7 +867,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:870: checking how to run the C preprocessor" >&5
+echo "configure:871: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -881,13 +882,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 885 "configure"
+#line 886 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:892: \"$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
:
@@ -898,13 +899,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 902 "configure"
+#line 903 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:909: \"$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
:
@@ -915,13 +916,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 919 "configure"
+#line 920 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:926: \"$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
:
@@ -947,13 +948,13 @@
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:951: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:952: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 957 "configure"
+#line 958 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -971,7 +972,7 @@
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 975 "configure"
+#line 976 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -1004,7 +1005,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1008: checking for a BSD compatible install" >&5
+echo "configure:1009: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1059,9 +1060,9 @@
### checks for UNIX variants that set C preprocessor variables
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1063: checking for AIX" >&5
+echo "configure:1064: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 1065 "configure"
+#line 1066 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -1083,7 +1084,7 @@
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1087: checking for POSIXized ISC" >&5
+echo "configure:1088: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1105,17 +1106,17 @@
ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1109: checking for minix/config.h" >&5
+echo "configure:1110: checking for minix/config.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1114 "configure"
+#line 1115 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1120: \"$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*
@@ -1162,17 +1163,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1166: checking for $ac_hdr" >&5
+echo "configure:1167: 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 1171 "configure"
+#line 1172 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1177: \"$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*
@@ -1202,13 +1203,13 @@
### checks for typedefs
echo $ac_n "checking for size_t in <sys/types.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1206: checking for size_t in <sys/types.h> or <stdio.h>" >&5
+echo "configure:1207: checking for size_t in <sys/types.h> or <stdio.h>" >&5
if eval "test \"`echo '$''{'cf_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1212 "configure"
+#line 1213 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1221,7 +1222,7 @@
size_t x
; return 0; }
EOF
-if { (eval echo configure:1225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_size_t=yes
else
@@ -1241,12 +1242,12 @@
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1245: checking for ANSI C header files" >&5
+echo "configure:1246: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1250 "configure"
+#line 1251 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1254,7 +1255,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1259: \"$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*
@@ -1271,7 +1272,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1275 "configure"
+#line 1276 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1289,7 +1290,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1293 "configure"
+#line 1294 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1310,7 +1311,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1314 "configure"
+#line 1315 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1321,7 +1322,7 @@
exit (0); }
EOF
-if { (eval echo configure:1325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1345,12 +1346,12 @@
fi
echo $ac_n "checking for time_t""... $ac_c" 1>&6
-echo "configure:1349: checking for time_t" >&5
+echo "configure:1350: checking for time_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1354 "configure"
+#line 1355 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1388,12 +1389,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1392: checking for $ac_func" >&5
+echo "configure:1393: 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 1397 "configure"
+#line 1398 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1416,7 +1417,7 @@
; return 0; }
EOF
-if { (eval echo configure:1420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1421: \"$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
@@ -1442,12 +1443,12 @@
echo $ac_n "checking for memmove""... $ac_c" 1>&6
-echo "configure:1446: checking for memmove" >&5
+echo "configure:1447: checking for memmove" >&5
if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1451 "configure"
+#line 1452 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove(); below. */
@@ -1470,7 +1471,7 @@
; return 0; }
EOF
-if { (eval echo configure:1474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_memmove=yes"
else
@@ -1489,12 +1490,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for bcopy""... $ac_c" 1>&6
-echo "configure:1493: checking for bcopy" >&5
+echo "configure:1494: checking for bcopy" >&5
if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1498 "configure"
+#line 1499 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bcopy(); below. */
@@ -1517,7 +1518,7 @@
; return 0; }
EOF
-if { (eval echo configure:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_bcopy=yes"
else
@@ -1533,7 +1534,7 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6
-echo "configure:1537: checking if bcopy does overlapping moves" >&5
+echo "configure:1538: checking if bcopy does overlapping moves" >&5
if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1542,7 +1543,7 @@
cf_cv_good_bcopy=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 1546 "configure"
+#line 1547 "configure"
#include "confdefs.h"
int main() {
@@ -1555,7 +1556,7 @@
}
EOF
-if { (eval echo configure:1559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_good_bcopy=yes
else
@@ -1593,7 +1594,7 @@
echo $ac_n "checking for full tgetent function""... $ac_c" 1>&6
-echo "configure:1597: checking for full tgetent function" >&5
+echo "configure:1598: checking for full tgetent function" >&5
if eval "test \"`echo '$''{'cf_cv_lib_tgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1608,7 +1609,7 @@
echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
else
cat > conftest.$ac_ext <<EOF
-#line 1612 "configure"
+#line 1613 "configure"
#include "confdefs.h"
/* terminfo implementations ignore the buffer argument, making it useless for
@@ -1622,7 +1623,7 @@
tgetent(buffer, "vt100");
exit(buffer[0] == 0); }
EOF
-if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5
if test -n "$cf_termlib" ; then
@@ -1658,7 +1659,7 @@
EOF
cat > conftest.$ac_ext <<EOF
-#line 1662 "configure"
+#line 1663 "configure"
#include "confdefs.h"
#include <termcap.h>
@@ -1669,7 +1670,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:1673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TERMCAP_H 1
@@ -1687,7 +1688,7 @@
# validate values for the TERM environment variable given to
# child processes.
echo $ac_n "checking for partial tgetent function""... $ac_c" 1>&6
-echo "configure:1691: checking for partial tgetent function" >&5
+echo "configure:1692: checking for partial tgetent function" >&5
if eval "test \"`echo '$''{'cf_cv_lib_part_tgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1696,14 +1697,14 @@
for cf_termlib in $cf_TERMLIB ; do
LIBS="$cf_save_LIBS -l$cf_termlib"
cat > conftest.$ac_ext <<EOF
-#line 1700 "configure"
+#line 1701 "configure"
#include "confdefs.h"
int main() {
tgetent(0, 0)
; return 0; }
EOF
-if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "there is a terminfo/tgetent in $cf_termlib" 1>&5
cf_cv_lib_part_tgetent="-l$cf_termlib"
@@ -1726,17 +1727,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1730: checking for $ac_hdr" >&5
+echo "configure:1731: 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 1735 "configure"
+#line 1736 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1741: \"$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*
@@ -1777,17 +1778,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1781: checking for $ac_hdr" >&5
+echo "configure:1782: 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 1786 "configure"
+#line 1787 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1792: \"$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*
@@ -1814,13 +1815,13 @@
done
echo $ac_n "checking for lastlog path""... $ac_c" 1>&6
-echo "configure:1818: checking for lastlog path" >&5
+echo "configure:1819: checking for lastlog path" >&5
if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1824 "configure"
+#line 1825 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1835,7 +1836,7 @@
char *path = _PATH_LASTLOG
; return 0; }
EOF
-if { (eval echo configure:1839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_path_lastlog="_PATH_LASTLOG"
else
@@ -1862,7 +1863,7 @@
echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6
-echo "configure:1866: checking for utmp implementation" >&5
+echo "configure:1867: 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
@@ -1870,7 +1871,7 @@
cf_cv_have_utmp=no
for cf_header in utmpx utmp ; do
cat > conftest.$ac_ext <<EOF
-#line 1874 "configure"
+#line 1875 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1886,7 +1887,7 @@
; return 0; }
EOF
-if { (eval echo configure:1890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp=$cf_header
break
@@ -1896,7 +1897,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 1900 "configure"
+#line 1901 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1912,7 +1913,7 @@
; return 0; }
EOF
-if { (eval echo configure:1916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp=$cf_header
cat >> confdefs.h <<\EOF
@@ -1947,13 +1948,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:1951: checking if utmp.ut_host is declared" >&5
+echo "configure:1952: 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 1957 "configure"
+#line 1958 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1962,7 +1963,7 @@
struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
; return 0; }
EOF
-if { (eval echo configure:1966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_host=yes
else
@@ -1986,7 +1987,7 @@
if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6
-echo "configure:1990: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "configure:1991: checking for exit-status in $cf_cv_have_utmp" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1998,7 +1999,7 @@
ut_exit.ut_exit
do
cat > conftest.$ac_ext <<EOF
-#line 2002 "configure"
+#line 2003 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2007,7 +2008,7 @@
struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
; return 0; }
EOF
-if { (eval echo configure:2011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_xstatus=$cf_result
break
@@ -2039,13 +2040,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:2043: checking if utmp.ut_xtime is declared" >&5
+echo "configure:2044: 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 2049 "configure"
+#line 2050 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2054,7 +2055,7 @@
struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
; return 0; }
EOF
-if { (eval echo configure:2058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_xtime=yes
else
@@ -2062,7 +2063,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2066 "configure"
+#line 2067 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2071,7 +2072,7 @@
struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
; return 0; }
EOF
-if { (eval echo configure:2075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_xtime=define
else
@@ -2106,13 +2107,13 @@
if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6
-echo "configure:2110: checking if utmp.ut_session is declared" >&5
+echo "configure:2111: 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 2116 "configure"
+#line 2117 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2121,7 +2122,7 @@
struct $cf_cv_have_utmp x; long y = x.ut_session
; return 0; }
EOF
-if { (eval echo configure:2125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_session=yes
else
@@ -2146,14 +2147,14 @@
echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6
-echo "configure:2150: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "configure:2151: 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
test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
cat > conftest.$ac_ext <<EOF
-#line 2157 "configure"
+#line 2158 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2167,7 +2168,7 @@
end${cf_prefix}ent();
; return 0; }
EOF
-if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_sysv_utmp=yes
else
@@ -2190,7 +2191,7 @@
echo $ac_n "checking if you want to link with utempter""... $ac_c" 1>&6
-echo "configure:2194: checking if you want to link with utempter" >&5
+echo "configure:2195: checking if you want to link with utempter" >&5
# Check whether --with-utempter or --without-utempter was given.
if test "${with_utempter+set}" = set; then
@@ -2205,7 +2206,7 @@
if test $use_utempter = yes ; then
echo $ac_n "checking if we can link with utempter library""... $ac_c" 1>&6
-echo "configure:2209: checking if we can link with utempter library" >&5
+echo "configure:2210: checking if we can link with utempter library" >&5
if eval "test \"`echo '$''{'cf_cv_have_utempter'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2213,7 +2214,7 @@
cf_save_LIBS="$LIBS"
LIBS="-lutempter $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2217 "configure"
+#line 2218 "configure"
#include "confdefs.h"
#include <utempter.h>
@@ -2225,7 +2226,7 @@
; return 0; }
EOF
-if { (eval echo configure:2229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_utempter=yes
@@ -2255,14 +2256,14 @@
### checks for structures
echo $ac_n "checking if POSIX VDISABLE symbol should be used""... $ac_c" 1>&6
-echo "configure:2259: checking if POSIX VDISABLE symbol should be used" >&5
+echo "configure:2260: 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 2266 "configure"
+#line 2267 "configure"
#include "confdefs.h"
#if defined(HAVE_TERMIOS_H) && defined(HAVE_TCGETATTR)
@@ -2280,7 +2281,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_posix_vdisable=yes
else
@@ -2292,7 +2293,7 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2296 "configure"
+#line 2297 "configure"
#include "confdefs.h"
#if defined(HAVE_TERMIOS_H) && defined(HAVE_TCGETATTR)
@@ -2305,7 +2306,7 @@
int main() { exit(_POSIX_VDISABLE == -1); }
#endif
EOF
-if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2310: \"$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
@@ -2331,13 +2332,13 @@
echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:2335: checking if external errno is declared" >&5
+echo "configure:2336: 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 2341 "configure"
+#line 2342 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -2350,7 +2351,7 @@
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:2354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'errno'=yes'
else
@@ -2381,13 +2382,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:2385: checking if external errno exists" >&5
+echo "configure:2386: 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 2391 "configure"
+#line 2392 "configure"
#include "confdefs.h"
#undef errno
@@ -2397,7 +2398,7 @@
errno = 2
; return 0; }
EOF
-if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2402: \"$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
@@ -2429,7 +2430,7 @@
echo $ac_n "checking for tty group""... $ac_c" 1>&6
-echo "configure:2433: checking for tty group" >&5
+echo "configure:2434: 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
@@ -2438,7 +2439,7 @@
cf_cv_tty_group=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 2442 "configure"
+#line 2443 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2452,7 +2453,7 @@
}
EOF
-if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2457: \"$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
@@ -2477,7 +2478,7 @@
### checks for compiler characteristics
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2481: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2482: 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
@@ -2501,7 +2502,7 @@
do
CFLAGS="$cf_save_CFLAGS $cf_arg"
cat > conftest.$ac_ext <<EOF
-#line 2505 "configure"
+#line 2506 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2517,7 +2518,7 @@
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:2521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2544,12 +2545,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2548: checking for working const" >&5
+echo "configure:2549: 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 2553 "configure"
+#line 2554 "configure"
#include "confdefs.h"
int main() {
@@ -2598,7 +2599,7 @@
; return 0; }
EOF
-if { (eval echo configure:2602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2622,12 +2623,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:2626: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2627: 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 2631 "configure"
+#line 2632 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2643,7 +2644,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2666,13 +2667,13 @@
echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:2670: checking if we must define _GNU_SOURCE" >&5
+echo "configure:2671: 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 2676 "configure"
+#line 2677 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2682,7 +2683,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2692,7 +2693,7 @@
cf_save="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
cat > conftest.$ac_ext <<EOF
-#line 2696 "configure"
+#line 2697 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2702,7 +2703,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2727,7 +2728,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:2731: checking for X" >&5
+echo "configure:2732: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -2790,12 +2791,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2794 "configure"
+#line 2795 "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:2799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2800: \"$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*
@@ -2864,14 +2865,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2868 "configure"
+#line 2869 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2875: \"$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*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2971,7 +2972,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:2975: checking for open in -lc_s" >&5
+echo "configure:2976: 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
@@ -2979,7 +2980,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2983 "configure"
+#line 2984 "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
@@ -2990,7 +2991,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:2994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2995: \"$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
@@ -3007,7 +3008,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:3011: checking for gethostname in -lbsd" >&5
+echo "configure:3012: 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
@@ -3015,7 +3016,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3019 "configure"
+#line 3020 "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
@@ -3026,7 +3027,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3031: \"$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
@@ -3043,7 +3044,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:3047: checking for gethostname in -lnsl_s" >&5
+echo "configure:3048: 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
@@ -3051,7 +3052,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3055 "configure"
+#line 3056 "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
@@ -3062,7 +3063,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3067: \"$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
@@ -3079,7 +3080,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:3083: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:3084: 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
@@ -3087,7 +3088,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3091 "configure"
+#line 3092 "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
@@ -3098,7 +3099,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3103: \"$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
@@ -3115,7 +3116,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:3119: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:3120: 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
@@ -3123,7 +3124,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3127 "configure"
+#line 3128 "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
@@ -3134,7 +3135,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3139: \"$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
@@ -3175,7 +3176,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3179: checking for socket in -lsocket" >&5
+echo "configure:3180: 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
@@ -3183,7 +3184,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3187 "configure"
+#line 3188 "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
@@ -3194,7 +3195,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3199: \"$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
@@ -3222,7 +3223,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3226: checking for gethostname in -lnsl" >&5
+echo "configure:3227: 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
@@ -3230,7 +3231,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3234 "configure"
+#line 3235 "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
@@ -3241,7 +3242,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3246: \"$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
@@ -3292,17 +3293,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:3296: checking whether -R must be followed by a space" >&5
+echo "configure:3297: 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 3299 "configure"
+#line 3300 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3318,14 +3319,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3322 "configure"
+#line 3323 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3357,7 +3358,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:3361: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3362: 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
@@ -3365,7 +3366,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3369 "configure"
+#line 3370 "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
@@ -3376,7 +3377,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3381: \"$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
@@ -3398,7 +3399,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:3402: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3403: 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
@@ -3406,7 +3407,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3410 "configure"
+#line 3411 "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
@@ -3417,7 +3418,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3422: \"$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
@@ -3446,12 +3447,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:3450: checking for gethostbyname" >&5
+echo "configure:3451: 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 3455 "configure"
+#line 3456 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3474,7 +3475,7 @@
; return 0; }
EOF
-if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3479: \"$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
@@ -3495,7 +3496,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3499: checking for gethostbyname in -lnsl" >&5
+echo "configure:3500: 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
@@ -3503,7 +3504,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3507 "configure"
+#line 3508 "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
@@ -3514,7 +3515,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3519: \"$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
@@ -3544,12 +3545,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:3548: checking for connect" >&5
+echo "configure:3549: 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 3553 "configure"
+#line 3554 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3572,7 +3573,7 @@
; return 0; }
EOF
-if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3577: \"$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
@@ -3593,7 +3594,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3597: checking for connect in -lsocket" >&5
+echo "configure:3598: 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
@@ -3601,7 +3602,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3605 "configure"
+#line 3606 "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
@@ -3612,7 +3613,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3617: \"$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
@@ -3636,12 +3637,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:3640: checking for remove" >&5
+echo "configure:3641: 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 3645 "configure"
+#line 3646 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3664,7 +3665,7 @@
; return 0; }
EOF
-if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3669: \"$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
@@ -3685,7 +3686,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3689: checking for remove in -lposix" >&5
+echo "configure:3690: 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
@@ -3693,7 +3694,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3697 "configure"
+#line 3698 "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
@@ -3704,7 +3705,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3709: \"$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
@@ -3728,12 +3729,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3732: checking for shmat" >&5
+echo "configure:3733: 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 3737 "configure"
+#line 3738 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3756,7 +3757,7 @@
; return 0; }
EOF
-if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3761: \"$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
@@ -3777,7 +3778,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3781: checking for shmat in -lipc" >&5
+echo "configure:3782: 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
@@ -3785,7 +3786,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3789 "configure"
+#line 3790 "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
@@ -3796,7 +3797,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:3800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3801: \"$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
@@ -3829,7 +3830,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:3833: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3834: 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
@@ -3837,7 +3838,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3841 "configure"
+#line 3842 "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
@@ -3848,7 +3849,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3853: \"$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
@@ -3875,7 +3876,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3879: checking for XOpenDisplay in -lX11" >&5
+echo "configure:3880: 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
@@ -3883,7 +3884,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3887 "configure"
+#line 3888 "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
@@ -3894,7 +3895,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3899: \"$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
@@ -3915,7 +3916,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3919: checking for XtAppInitialize in -lXt" >&5
+echo "configure:3920: 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
@@ -3923,7 +3924,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3927 "configure"
+#line 3928 "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
@@ -3934,7 +3935,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3939: \"$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
@@ -3990,17 +3991,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3994: checking for $ac_hdr" >&5
+echo "configure:3995: 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 3999 "configure"
+#line 4000 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4005: \"$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*
@@ -4048,7 +4049,7 @@
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4052: checking for XextCreateExtension in -lXext" >&5
+echo "configure:4053: 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
@@ -4056,7 +4057,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4060 "configure"
+#line 4061 "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
@@ -4067,7 +4068,7 @@
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4072: \"$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
@@ -4103,13 +4104,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:4107: checking for $cf_test in $cf_path" >&5
+echo "configure:4108: checking for $cf_test in $cf_path" >&5
else
echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:4110: checking for $cf_test" >&5
+echo "configure:4111: checking for $cf_test" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 4113 "configure"
+#line 4114 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -4118,7 +4119,7 @@
; return 0; }
EOF
-if { (eval echo configure:4122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_result=yes
else
@@ -4144,21 +4145,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:4148: checking for $cf_lib in $cf_path" >&5
+echo "configure:4149: 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:4152: checking for $cf_test in $cf_lib" >&5
+echo "configure:4153: checking for $cf_test in $cf_lib" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 4155 "configure"
+#line 4156 "configure"
#include "confdefs.h"
int main() {
$cf_test()
; return 0; }
EOF
-if { (eval echo configure:4162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -4196,13 +4197,13 @@
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:4200: checking for declaration of fd_set" >&5
+echo "configure:4201: 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 4206 "configure"
+#line 4207 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4210,7 +4211,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -4219,7 +4220,7 @@
rm -rf conftest*
echo "trying X11/Xpoll.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4223 "configure"
+#line 4224 "configure"
#include "confdefs.h"
#ifdef HAVE_X11_XPOLL_H
@@ -4229,7 +4230,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=X11/Xpoll.h
else
@@ -4238,7 +4239,7 @@
rm -rf conftest*
echo "trying sys/select.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4242 "configure"
+#line 4243 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4247,7 +4248,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -4281,12 +4282,12 @@
for ac_func in grantpt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4285: checking for $ac_func" >&5
+echo "configure:4286: 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 4290 "configure"
+#line 4291 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4309,7 +4310,7 @@
; return 0; }
EOF
-if { (eval echo configure:4313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4314: \"$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
@@ -4331,7 +4332,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4335: checking for openpty in -lutil" >&5
+echo "configure:4336: 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
@@ -4339,7 +4340,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4343 "configure"
+#line 4344 "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
@@ -4350,7 +4351,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:4354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4355: \"$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
@@ -4384,7 +4385,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:4388: checking for $ac_word" >&5
+echo "configure:4389: 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
@@ -4422,12 +4423,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4426: checking for $ac_func" >&5
+echo "configure:4427: 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 4431 "configure"
+#line 4432 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4450,7 +4451,7 @@
; return 0; }
EOF
-if { (eval echo configure:4454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4455: \"$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
@@ -4476,7 +4477,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:4480: checking if we should use imake to help" >&5
+echo "configure:4481: 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
@@ -4501,7 +4502,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:4505: checking for $ac_word" >&5
+echo "configure:4506: 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
@@ -4640,7 +4641,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:4644: checking for default terminal-id" >&5
+echo "configure:4645: 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
@@ -4661,7 +4662,7 @@
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:4665: checking for default terminal-type" >&5
+echo "configure:4666: 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
@@ -4678,7 +4679,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:4682: checking for private terminfo-directory" >&5
+echo "configure:4683: 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
@@ -4717,7 +4718,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:4721: checking if you want active-icons" >&5
+echo "configure:4722: 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
@@ -4743,7 +4744,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:4747: checking if you want ANSI color" >&5
+echo "configure:4748: 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
@@ -4769,7 +4770,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:4773: checking if you want 16 colors like aixterm" >&5
+echo "configure:4774: 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
@@ -4793,7 +4794,7 @@
echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
-echo "configure:4797: checking if you want 256 colors" >&5
+echo "configure:4798: 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
@@ -4820,7 +4821,7 @@
else
echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
-echo "configure:4824: checking if you want 88 colors" >&5
+echo "configure:4825: 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
@@ -4851,7 +4852,7 @@
fi
echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
-echo "configure:4855: checking if you want blinking cursor" >&5
+echo "configure:4856: 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
@@ -4877,7 +4878,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:4881: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:4882: 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
@@ -4901,7 +4902,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4905: checking if you want color-mode enabled by default" >&5
+echo "configure:4906: 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
@@ -4927,7 +4928,7 @@
fi
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:4931: checking if you want support for color highlighting" >&5
+echo "configure:4932: 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
@@ -4951,7 +4952,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:4955: checking if you want support for doublesize characters" >&5
+echo "configure:4956: 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
@@ -4975,7 +4976,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:4979: checking if you want fallback-support for box characters" >&5
+echo "configure:4980: 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
@@ -4999,7 +5000,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:5003: checking if you want support for HP-style function keys" >&5
+echo "configure:5004: 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
@@ -5024,8 +5025,34 @@
fi
+echo $ac_n "checking if you want support for SCO-style function keys""... $ac_c" 1>&6
+echo "configure:5030: checking if you want support for SCO-style function keys" >&5
+
+# Check whether --enable-sco-fkeys or --disable-sco-fkeys was given.
+if test "${enable_sco_fkeys+set}" = set; then
+ enableval="$enable_sco_fkeys"
+ test "$enableval" != yes && enableval=no
+ if test "$enableval" != "no" ; then
+ enable_sco_fkeys=yes
+ else
+ enable_sco_fkeys=no
+ fi
+else
+ enableval=no
+ enable_sco_fkeys=no
+
+fi
+
+echo "$ac_t""$enable_sco_fkeys" 1>&6
+if test $enable_sco_fkeys = yes ; then
+ cat >> confdefs.h <<\EOF
+#define OPT_SCO_FUNC_KEYS 1
+EOF
+
+fi
+
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:5029: checking if you want support for internationalization" >&5
+echo "configure:5056: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -5051,7 +5078,7 @@
fi
echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:5055: checking if you want support for initial-erase setup" >&5
+echo "configure:5082: 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
@@ -5077,7 +5104,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:5081: checking if you want support for input-method" >&5
+echo "configure:5108: 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
@@ -5097,13 +5124,13 @@
echo "$ac_t""$enable_ximp" 1>&6
echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
-echo "configure:5101: checking if X libraries support input-method" >&5
+echo "configure:5128: 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 5107 "configure"
+#line 5134 "configure"
#include "confdefs.h"
#include <X11/IntrinsicP.h>
@@ -5117,9 +5144,9 @@
{
XIM xim;
- XIMStyles *xim_styles;
+ XIMStyles *xim_styles = 0;
XIMStyle input_style;
- Widget w;
+ Widget w = 0;
XSetLocaleModifiers("@im=none");
xim = XOpenIM(XtDisplay(w), NULL, NULL, NULL);
@@ -5130,7 +5157,7 @@
; return 0; }
EOF
-if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_input_method=yes
else
@@ -5153,7 +5180,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:5157: checking if you want support for logging" >&5
+echo "configure:5184: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -5177,7 +5204,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:5181: checking if you want to allow logging via a pipe" >&5
+echo "configure:5208: 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
@@ -5204,7 +5231,7 @@
fi
echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:5208: checking if you want support for iconify/maximize translations" >&5
+echo "configure:5235: 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
@@ -5228,7 +5255,7 @@
echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:5232: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:5259: 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
@@ -5252,7 +5279,7 @@
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:5256: checking if you want support for right-scrollbar" >&5
+echo "configure:5283: 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
@@ -5278,7 +5305,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:5282: checking if you want check for redundant name-change" >&5
+echo "configure:5309: 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
@@ -5302,7 +5329,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:5306: checking if you want support for tek4014" >&5
+echo "configure:5333: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -5332,7 +5359,7 @@
fi
echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
-echo "configure:5336: checking if you want pulldown menus with a toolbar" >&5
+echo "configure:5363: 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
@@ -5356,7 +5383,7 @@
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:5360: checking if you want VT52 emulation" >&5
+echo "configure:5387: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -5380,7 +5407,7 @@
echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:5384: checking if you want wide-character support" >&5
+echo "configure:5411: 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
@@ -5409,7 +5436,7 @@
fi
echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
-echo "configure:5413: checking if you want DECterm Locator support" >&5
+echo "configure:5440: 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
@@ -5435,7 +5462,7 @@
fi
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:5439: checking if you want -ziconbeep option" >&5
+echo "configure:5466: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -5460,7 +5487,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:5464: checking if you want debugging traces" >&5
+echo "configure:5491: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -5489,7 +5516,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:5493: checking if you want to see long compiling messages" >&5
+echo "configure:5520: 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
@@ -5529,7 +5556,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:5533: checking if you want magic cookie emulation" >&5
+echo "configure:5560: 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
@@ -5558,7 +5585,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:5562: checking if you want to turn on gcc warnings" >&5
+echo "configure:5589: 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
@@ -5598,9 +5625,9 @@
if test -n "$GCC"
then
echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:5602: checking for $CC __attribute__ directives" >&5
+echo "configure:5629: checking for $CC __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 5604 "configure"
+#line 5631 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -5638,7 +5665,7 @@
EOF
;;
esac
- if { (eval echo configure:5642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5669: \"$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
@@ -5655,11 +5682,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 5659 "configure"
+#line 5686 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for $CC warning options" 1>&6
-echo "configure:5663: checking for $CC warning options" >&5
+echo "configure:5690: checking for $CC warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -5677,7 +5704,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:5681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5708: \"$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: configure.in
--- xterm-129+/configure.in Tue Jan 25 01:45:01 2000
+++ xterm-130/configure.in Tue Feb 29 20:50:42 2000
@@ -306,6 +306,16 @@
AC_DEFINE(OPT_HP_FUNC_KEYS,1)
fi
+AC_MSG_CHECKING(if you want support for SCO-style function keys)
+CF_ARG_ENABLE(sco-fkeys,
+ [ --enable-sco-fkeys enable support for SCO-style function keys],
+ [enable_sco_fkeys=yes],
+ [enable_sco_fkeys=no])
+AC_MSG_RESULT($enable_sco_fkeys)
+if test $enable_sco_fkeys = yes ; then
+ AC_DEFINE(OPT_SCO_FUNC_KEYS,1)
+fi
+
AC_MSG_CHECKING(if you want support for internationalization)
CF_ARG_DISABLE(i18n,
[ --disable-i18n disable internationalization],
Index: ctlseqs.ms
--- xterm-129+/ctlseqs.ms Sun Feb 13 08:01:12 2000
+++ xterm-130/ctlseqs.ms Tue Feb 29 20:45:52 2000
@@ -294,6 +294,7 @@
.IP \*(Pm
A multiple numeric parameter composed of any number of single numeric
parameters, separated by \*; character(s).
+Individual values for the parameters are listed with \*(Ps .
.IP \*(Pt
A text parameter composed of printable characters.
.
@@ -673,7 +674,7 @@
It should apply only to VT220 and up, but \fIxterm\fP extends this to VT100.
\(-> \*(Cs\*(Pp\*s\*;\*(Pv\*s\*;\*(Pc\*s\*c
.br
-where \*(Pc denotes the terminal type
+where \*(Pp denotes the terminal type
\(-> \*0 (``VT100'')
\(-> \*1 (``VT220'')
.br
Index: fontutils.c
--- xterm-129+/fontutils.c Wed Feb 9 17:47:18 2000
+++ xterm-130/fontutils.c Wed Mar 1 20:57:08 2000
@@ -601,6 +601,7 @@
* characters. Check that they are all present. The null character
* (0) is special, and is not used.
*/
+ screen->force_box_chars = False;
for (ch = 1; ch < 32; ch++) {
int n = ch;
#if OPT_WIDE_CHARS
@@ -616,7 +617,9 @@
break;
}
}
+ TRACE(("Will %suse internal line-drawing characters\n", screen->fnt_boxes ? "not " : ""));
#endif
+ screen->force_box_chars = !screen->fnt_boxes;
screen->enbolden = screen->bold_mode
&& ((nfs == bfs) || same_font_name(normal, bfontname));
@@ -766,6 +769,11 @@
TRACE(("xtermMissingChar %#04x (!exists)\n", ch));
return True;
}
+ }
+ if (ch < 32
+ && term->screen.force_box_chars) {
+ TRACE(("xtermMissingChar %#04x (forced off)\n", ch));
+ return True;
}
return False;
}
Index: input.c
--- xterm-129+/input.c Sun Feb 13 08:01:12 2000
+++ xterm-130/input.c Tue Feb 29 21:32:48 2000
@@ -90,6 +90,9 @@
#if OPT_HP_FUNC_KEYS
static int hpfuncvalue (KeySym keycode);
#endif
+#if OPT_SCO_FUNC_KEYS
+static int scofuncvalue (KeySym keycode);
+#endif
#if OPT_TRACE
static char *
@@ -490,6 +493,14 @@
unparseseq(&reply, pty);
} else
#endif
+#if OPT_SCO_FUNC_KEYS
+ if (term->keyboard.type == keyboardIsSCO
+ && (reply.a_final = scofuncvalue (keysym)) != 0) {
+ reply.a_type = CSI;
+ MODIFIER_PARM;
+ unparseseq(&reply, pty);
+ } else
+#endif
if (IsPFKey(keysym)) {
reply.a_type = SS3;
reply.a_final = keysym-XK_KP_F1+'P';
@@ -757,6 +768,64 @@
#endif
case XK_Select: return('F');
case XK_Find: return('h');
+ default: return 0;
+ }
+}
+#endif
+
+#if OPT_SCO_FUNC_KEYS
+static int
+scofuncvalue (KeySym keycode)
+{
+ switch (keycode) {
+ case XK_Up: return('A');
+ case XK_Down: return('B');
+ case XK_Right: return('C');
+ case XK_Left: return('D');
+ case XK_End: return('F');
+ case XK_Insert: return('L');
+ case XK_Next: return('G');
+ case XK_Prior: return('I');
+ case XK_Home: return('H');
+ case XK_F1: return('M');
+ case XK_F2: return('N');
+ case XK_F3: return('O');
+ case XK_F4: return('P');
+ case XK_F5: return('Q');
+ case XK_F6: return('R');
+ case XK_F7: return('S');
+ case XK_F8: return('T');
+ case XK_F9: return('U');
+ case XK_F10: return('V');
+ case XK_F11: return('W');
+ case XK_F12: return('X');
+ case XK_F13: return('Y');
+ case XK_F15: return('a');
+ case XK_F16: return('b');
+ case XK_F17: return('c');
+ case XK_F18: return('d');
+ case XK_F19: return('e');
+ case XK_F20: return('f');
+#if defined(XK_F21)
+ case XK_F21: return('g');
+ case XK_F22: return('h');
+ case XK_F23: return('i');
+ case XK_F24: return('j');
+ case XK_F25: return('k');
+ case XK_F26: return('l');
+ case XK_F27: return('m');
+ case XK_F28: return('n');
+ case XK_F29: return('o');
+ case XK_F30: return('p');
+ case XK_F31: return('q');
+ case XK_F32: return('r');
+ case XK_F33: return('s');
+ case XK_F34: return('t');
+ case XK_F35: return('u');
+#endif
+#ifdef XK_KP_Insert
+ case XK_KP_Insert: return('L');
+#endif
default: return 0;
}
}
Index: main.c
--- xterm-129+/main.c Sat Feb 12 06:47:41 2000
+++ xterm-130/main.c Tue Feb 29 20:50:42 2000
@@ -4261,7 +4261,7 @@
/* ARGSUSED */
static void
-resize(TScreen *screen, register char *oldtc, register char *newtc)
+resize(TScreen *screen, register char *oldtc, char *newtc)
{
#ifndef USE_SYSV_ENVVARS
register char *ptr1, *ptr2;
Index: menu.c
--- xterm-129+/menu.c Sun Feb 13 08:01:12 2000
+++ xterm-130/menu.c Wed Mar 1 20:57:29 2000
@@ -125,6 +125,10 @@
static void do_cursorblink PROTO_XT_CALLBACK_ARGS;
#endif
+#if OPT_BOX_CHARS
+static void do_font_boxchars PROTO_XT_CALLBACK_ARGS;
+#endif
+
#if OPT_DEC_CHRSET
static void do_font_doublesize PROTO_XT_CALLBACK_ARGS;
#endif
@@ -257,8 +261,11 @@
{ "fontescape", do_vtfont, NULL },
{ "fontsel", do_vtfont, NULL },
/* down to here should match NMENUFONTS in ptyx.h */
-#if OPT_DEC_CHRSET || OPT_DEC_SOFTFONT
+#if OPT_DEC_CHRSET || OPT_BOX_CHARS || OPT_DEC_SOFTFONT
{ "line1", NULL, NULL },
+#if OPT_BOX_CHARS
+ { "font-linedrawing",do_font_boxchars,NULL },
+#endif
#if OPT_DEC_CHRSET
{ "font-doublesize",do_font_doublesize,NULL },
#endif
@@ -534,14 +541,20 @@
fontMenuEntries[fontMenu_fontescape].widget,
(screen->menu_font_names[fontMenu_fontescape]
? TRUE : FALSE));
- update_font_doublesize();
- update_font_loadable();
+#if OPT_BOX_CHARS
+ update_font_boxchars();
+ set_sensitivity (mw,
+ fontMenuEntries[fontMenu_font_boxchars].widget,
+ True);
+#endif
#if OPT_DEC_SOFTFONT /* FIXME: not implemented */
+ update_font_loadable();
set_sensitivity (mw,
fontMenuEntries[fontMenu_font_loadable].widget,
FALSE);
#endif
#if OPT_DEC_CHRSET
+ update_font_doublesize();
if (term->screen.cache_doublesize == 0)
set_sensitivity (mw,
fontMenuEntries[fontMenu_font_doublesize].widget,
@@ -1197,6 +1210,18 @@
}
#endif
+#if OPT_BOX_CHARS
+static void do_font_boxchars (
+ Widget gw GCC_UNUSED,
+ XtPointer closure GCC_UNUSED,
+ XtPointer data GCC_UNUSED)
+{
+ term->screen.force_box_chars = ! term->screen.force_box_chars;
+ update_font_boxchars();
+ Redraw ();
+}
+#endif
+
#if OPT_DEC_SOFTFONT
static void do_font_loadable (
Widget gw GCC_UNUSED,
@@ -1795,6 +1820,18 @@
Cardinal *param_count)
{
handle_toggle (do_font_doublesize, (int) term->screen.font_doublesize,
+ params, *param_count, w, (XtPointer)0, (XtPointer)0);
+}
+#endif
+
+#if OPT_BOX_CHARS
+void HandleFontBoxChars(
+ Widget w,
+ XEvent *event GCC_UNUSED,
+ String *params,
+ Cardinal *param_count)
+{
+ handle_toggle (do_font_boxchars, (int) term->screen.force_box_chars,
params, *param_count, w, (XtPointer)0, (XtPointer)0);
}
#endif
Index: menu.h
--- xterm-129+/menu.h Sun Feb 13 08:01:12 2000
+++ xterm-130/menu.h Wed Mar 1 20:55:51 2000
@@ -88,6 +88,7 @@
extern void HandleCursesEmul PROTO_XT_ACTIONS_ARGS;
extern void HandleCursorBlink PROTO_XT_ACTIONS_ARGS;
extern void HandleDeleteIsDEL PROTO_XT_ACTIONS_ARGS;
+extern void HandleFontBoxChars PROTO_XT_ACTIONS_ARGS;
extern void HandleFontDoublesize PROTO_XT_ACTIONS_ARGS;
extern void HandleFontLoading PROTO_XT_ACTIONS_ARGS;
extern void HandleHardReset PROTO_XT_ACTIONS_ARGS;
@@ -97,13 +98,13 @@
extern void HandleMarginBell PROTO_XT_ACTIONS_ARGS;
extern void HandleMetaEsc PROTO_XT_ACTIONS_ARGS;
extern void HandleNumLock PROTO_XT_ACTIONS_ARGS;
+extern void HandleOldFunctionKeys PROTO_XT_ACTIONS_ARGS;
extern void HandlePopupMenu PROTO_XT_ACTIONS_ARGS;
extern void HandlePrint PROTO_XT_ACTIONS_ARGS;
extern void HandleQuit PROTO_XT_ACTIONS_ARGS;
extern void HandleRedraw PROTO_XT_ACTIONS_ARGS;
extern void HandleReverseVideo PROTO_XT_ACTIONS_ARGS;
extern void HandleReverseWrap PROTO_XT_ACTIONS_ARGS;
-extern void HandleOldFunctionKeys PROTO_XT_ACTIONS_ARGS;
extern void HandleScoFunctionKeys PROTO_XT_ACTIONS_ARGS;
extern void HandleScrollKey PROTO_XT_ACTIONS_ARGS;
extern void HandleScrollTtyOutput PROTO_XT_ACTIONS_ARGS;
@@ -153,7 +154,7 @@
mainMenu_hp_fkeys,
#endif
#if OPT_SCO_FUNC_KEYS
- mainMenu_sco_kbd,
+ mainMenu_sco_fkeys,
#endif
mainMenu_sun_fkeys,
#if OPT_SUNPC_KBD
@@ -226,8 +227,11 @@
fontMenu_fontescape,
fontMenu_fontsel,
/* number of non-line items down to here should match NMENUFONTS in ptyx.h */
-#if OPT_DEC_CHRSET
+#if OPT_DEC_CHRSET || OPT_BOX_CHARS || OPT_DEC_SOFTFONT
fontMenu_line1,
+#if OPT_BOX_CHARS
+ fontMenu_font_boxchars,
+#endif
#if OPT_DEC_CHRSET
fontMenu_font_doublesize,
#endif
@@ -463,6 +467,15 @@
term->screen.font_doublesize)
#else
#define update_font_doublesize() /* nothing */
+#endif
+
+#if OPT_BOX_CHARS
+#define update_font_boxchars() \
+ update_menu_item (term->screen.fontMenu, \
+ fontMenuEntries[fontMenu_font_boxchars].widget, \
+ term->screen.force_box_chars)
+#else
+#define update_font_boxchars() /* nothing */
#endif
#if OPT_DEC_SOFTFONT
Index: misc.c
--- xterm-129+/misc.c Wed Mar 1 02:22:43 2000
+++ xterm-130/misc.c Wed Mar 1 06:37:33 2000
@@ -59,6 +59,8 @@
#include <xterm.h>
#include <X11/Xos.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <signal.h>
#include <ctype.h>
@@ -843,6 +845,7 @@
void
StartLog(register TScreen *screen)
{
+ struct stat sb;
static char *log_default;
#ifdef ALLOWLOGFILEEXEC
register char *cp;
@@ -948,6 +951,18 @@
if((screen->logfd = open(screen->logfile, O_WRONLY | O_APPEND,
0644)) < 0)
return;
+ /*
+ * If the logfile is specified by the user, it may be in an
+ * insecure location. Doublecheck that the user really owns
+ * the file that we've opened before we do any damage.
+ */
+ if (fstat(screen->logfd, &sb) < 0
+ || (int) sb.st_uid != screen->uid
+ || (int) sb.st_gid != screen->gid) {
+ fprintf(stderr, "%s: you do not own %s\n",
+ xterm_name, screen->logfile);
+ close(screen->logfd);
+ }
}
#endif /*VMS*/
screen->logstart = CURRENT_EMU_VAL(screen, Tbuffer->ptr, VTbuffer.ptr);
Index: ptyx.h
--- xterm-129+/ptyx.h Wed Mar 1 02:22:43 2000
+++ xterm-130/ptyx.h Wed Mar 1 20:55:51 2000
@@ -974,6 +974,7 @@
Boolean fnt_prop; /* true if proportional fonts */
Boolean fnt_boxes; /* true if font has box-chars */
+ Boolean force_box_chars; /* true if we assume that */
Dimension fnt_wide;
Dimension fnt_high;
XFontStruct *fnt_norm; /* normal font of terminal */
Index: screen.c
--- xterm-129+/screen.c Wed Feb 9 17:47:18 2000
+++ xterm-130/screen.c Tue Feb 29 20:56:04 2000
@@ -284,7 +284,7 @@
PAIRED_CHARS(Char *str, Char *str2),
register unsigned flags,
register unsigned cur_fg_bg,
- register int length) /* length of string */
+ register int len) /* length of string */
{
#if OPT_ISO_COLORS
#if OPT_EXT_COLORS
@@ -297,6 +297,7 @@
#if OPT_DEC_CHRSET
register Char *cb = 0;
#endif
+ register int length = len; /* workaround for compiler bug? */
register Char *attrs;
register int avail = screen->max_col - screen->cur_col + 1;
register Char *col;
Index: scrollbar.c
--- xterm-129+/scrollbar.c Wed Feb 9 17:47:18 2000
+++ xterm-130/scrollbar.c Tue Feb 29 20:50:42 2000
@@ -66,6 +66,7 @@
#include <data.h>
#include <error.h>
#include <menu.h>
+#include <xcharmouse.h>
/* Event handlers */
@@ -361,7 +362,7 @@
if (screen->scrollWidget) return;
/* make it a dummy size and resize later */
- if ((screen->scrollWidget = CreateScrollBar (xw, -1, - 1, 5))
+ if ((screen->scrollWidget = CreateScrollBar (xw, -1, -1, 5))
== NULL) {
Bell(XkbBI_MinorError,0);
return;
@@ -561,6 +562,18 @@
return mult;
}
+static long
+AmountToScroll(Widget gw, String *params, Cardinal nparams)
+{
+ if (IsXtermWidget(gw)) {
+ register TScreen *screen = &((XtermWidget)gw)->screen;
+ if (nparams > 2
+ && screen->send_mouse_pos != MOUSE_OFF)
+ return 0;
+ return params_to_pixels (screen, params, nparams);
+ }
+ return 0;
+}
/*ARGSUSED*/
void HandleScrollForward (
@@ -569,12 +582,11 @@
String *params,
Cardinal *nparams)
{
- if (IsXtermWidget(gw)) {
- register TScreen *screen = &((XtermWidget)gw)->screen;
- long amount = params_to_pixels (screen, params, *nparams);
+ long amount;
+
+ if ((amount = AmountToScroll(gw, params, *nparams)) != 0) {
ScrollTextUpDownBy (gw, (XtPointer) 0, (XtPointer)amount);
}
- return;
}
@@ -585,10 +597,9 @@
String *params,
Cardinal *nparams)
{
- if (IsXtermWidget(gw)) {
- register TScreen *screen = &((XtermWidget)gw)->screen;
- long amount = -params_to_pixels (screen, params, *nparams);
+ long amount;
+
+ if ((amount = -AmountToScroll(gw, params, *nparams)) != 0) {
ScrollTextUpDownBy (gw, (XtPointer) 0, (XtPointer)amount);
}
- return;
}
Index: sinstall.sh
--- xterm-129+/sinstall.sh Fri Nov 19 15:27:18 1999
+++ xterm-130/sinstall.sh Mon Feb 28 22:21:55 2000
@@ -24,7 +24,7 @@
test -z "$SINSTALL" && SINSTALL=install
test -z "$NEW_PROG" && NEW_PROG=xterm
test -z "$REF_PROG" && REF_PROG=/usr/bin/X11/xterm
-test -z "$TST_PROG" && REF_PROG="$REF_PROG"
+test -z "$TST_PROG" && TST_PROG="$REF_PROG"
PROG_MODE=755
PROG_USR=
Index: util.c
--- xterm-129+/util.c Wed Mar 1 02:22:43 2000
+++ xterm-130/util.c Wed Mar 1 20:57:07 2000
@@ -1554,7 +1554,7 @@
}
/* If the font is complete, draw it as-is */
- if (screen->fnt_boxes) {
+ if (screen->fnt_boxes && !screen->force_box_chars) {
TRACE(("drawtext%c[%4d,%4d] (%d) %d:%s\n",
screen->cursor_state == OFF ? ' ' : '*',
y, x, chrset, len,
@@ -1624,6 +1624,7 @@
? screen->fnt_bold
: screen->fnt_norm;
Cardinal last, first = 0;
+ Boolean save_force = screen->force_box_chars;
screen->fnt_boxes = True;
for (last = 0; last < len; last++) {
@@ -1634,16 +1635,20 @@
#endif
if (xtermMissingChar(ch, font)) {
if (last > first) {
+ screen->force_box_chars = False;
DrawSegment(first,last);
+ screen->force_box_chars = save_force;
}
xtermDrawBoxChar(screen, ch, flags, gc, DrawX(last), y);
first = last + 1;
}
}
if (last > first) {
+ screen->force_box_chars = False;
DrawSegment(first,last);
}
screen->fnt_boxes = False;
+ screen->force_box_chars = save_force;
#endif
}
Index: version.h
--- xterm-129+/version.h Wed Mar 1 02:22:43 2000
+++ xterm-130/version.h Wed Mar 1 19:52:51 2000
@@ -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 129
+#define XTERM_PATCH 130
#define XFREE86_VERSION "XFree86 4.0"
Index: xterm.log.html
--- xterm-129+/xterm.log.html Wed Mar 1 02:22:43 2000
+++ xterm-130/xterm.log.html Wed Mar 1 06:41:50 2000
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_130">Patch #130 - 2000/3/1 - XFree86 3.9.18a</A>
<LI><A HREF="#xterm_129">Patch #129 - 2000/2/26 - XFree86 3.9.18a</A>
<LI><A HREF="#xterm_128">Patch #128 - 2000/2/17 - XFree86 3.9.18</A>
<LI><A HREF="#xterm_127">Patch #127 - 2000/2/12 - XFree86 3.9.17e</A>
@@ -172,6 +173,35 @@
<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_130">Patch #130 - 2000/3/1 - XFree86 3.9.18a</A></H1>
+<ul>
+ <li>modify <code>scroll-forw()</code> and <code>scroll-back()</code>
+ actions, adding a third parameter which will direct xterm to ignore
+ the action when mouse reporting is enabled. This is needed for
+ the wheel mouse to be used to report to the application rather than
+ scroll the window.
+
+ <li>add menu entry and action to allow disabling xterm's assumption
+ that the current font contains line-drawing characters if the
+ font cells 1-31 are nonempty. Some fonts may have other characters
+ (reported by Bruno Betro <bruno@iami.mi.cnr.it>).
+
+ <li>add a check in <code>creat_as()</code> to ensure that the user
+ really owns the logfile that has been opened.
+
+ <li>add logic to implement SCO function-keys. (This is really
+ incomplete, since I intend to revisit this and make xterm able to
+ emulate scoansi better than just the function-keys).
+
+ <li>add configure script option --enable-sco-fkeys, minor related fixes
+ (patch by Dr Werner Fink).
+
+ <li>fix typos in ctlseqs.ms (reported by Bram Moolenaar)
+
+ <li>fix typo in sinstall.sh default for $TST_PROG (reported by
+ Paul Gilmartin <pg@sweng.stortek.com>)
+</ul>
<H1><A NAME="xterm_129">Patch #129 - 2000/2/26 - XFree86 3.9.18a</A></H1>
<ul>
Index: xterm.man
--- xterm-129+/xterm.man Sun Feb 13 08:01:12 2000
+++ xterm-130/xterm.man Wed Mar 1 05:56:32 2000
@@ -136,6 +136,11 @@
.I xterm
is started in, or the home directory for a login
.IR xterm ).
+.PP
+Not all of the features described in this manual are necessarily available in
+this version of xterm. Some (e.g., the non-VT220 extensions) are available
+only if they were compiled in, though the most commonly-used are in the
+default configuration.
.SH "OTHER FEATURES"
.I Xterm
automatically highlights the text cursor when the
@@ -1484,6 +1489,9 @@
.B "hp\ function-keys (\fPclass\fB SmeBSB)"
This entry invokes the \fBhp\ function-keys(toggle)\fP action.
.TP 8
+.B "sco\ function-keys (\fPclass\fB SmeBSB)"
+This entry invokes the \fBsco\ function-keys(toggle)\fP action.
+.TP 8
.B "sun\ function-keys (\fPclass\fB SmeBSB)"
This entry invokes the \fBsun\ function-keys(toggle)\fP action.
.TP 8
@@ -1636,6 +1644,9 @@
.B "line1 (\fPclass\fB SmeLine)"
This is a separator.
.TP 8
+.B "font-linedrawing (\fPclass\fB SmeBSB)"
+This entry invokes the \fBset-font-linedrawing(s)\fP action.
+.TP 8
.B "font-doublesize (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-font-doublesize(s)\fP action.
.sp
@@ -2101,13 +2112,15 @@
.B "restore()"
Restores the window to the size before it was last maximized.
.TP 8
-.B "scroll-back(\fIcount\fP [,\fIunits\fP])"
+.B "scroll-back(\fIcount\fP [,\fIunits\fP [,\fImouse\fP] ])"
This action scrolls the text window backward so that text that had previously
scrolled off the top of the screen is now visible. The \fIcount\fP argument
indicates the number of \fIunits\fP (which may be \fIpage\fP, \fIhalfpage\fP,
\fIpixel\fP, or \fIline\fP) by which to scroll.
+If the third parameter \fImouse\fP is given, the action is ignored when
+mouse reporting is enabled.
.TP 8
-.B "scroll-forw(\fIcount\fP [,\fIunits\fP])"
+.B "scroll-forw(\fIcount\fP [,\fIunits\fP [,\fImouse\fP] ])"
This action scrolls is similar to \fBscroll-back\fP except that it scrolls
the other direction.
.TP 8
@@ -2204,18 +2217,23 @@
.TP 8
.B "set-hp-function-keys(\fIon/off/toggle\fP)"
This action toggles the \fBhpFunctionKeys\fP resource and is also invoked by
-the \fBhp function-keys\fP entry in \fImainMenu\fP.
+the \fBhp\ function-keys\fP entry in \fImainMenu\fP.
.TP 8
.B "set-jumpscroll(\fIon/off/toggle\fP)"
This action toggles the \fBjumpscroll\fP resource and is also invoked by the
\fBjumpscroll\fP entry in \fIvtMenu\fP.
.TP 8
+.B "set-font-linedrawing(\fIon/off/toggle\fP)"
+This action toggles the xterm's state regarding whether the current font
+has line-drawing characters and whether it should draw them directly.
+It is also invoked by the \fBfont-linedrawing\fP entry in \fIfontMenu\fP.
+.TP 8
.B "set-logging()"
This action toggles the state of the logging option.
.TP 8
.B "set-old-function-keys(\fIon/off/toggle\fP)"
This action toggles the state of legacy function keys and is also invoked by
-the \fBold function-keys\fP entry in \fImainMenu\fP.
+the \fBold\ function-keys\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
@@ -2244,9 +2262,13 @@
This action toggles the \fBscrollbar\fP resource and is also invoked by
the \fBscrollbar\fP entry in \fIvtMenu\fP.
.TP 8
+.B "set-sco-function-keys(\fIon/off/toggle\fP)"
+This action toggles the \fBscoFunctionKeys\fP resource and is also invoked by
+the \fBsco\ function-keys\fP entry in \fImainMenu\fP.
+.TP 8
.B "set-sun-function-keys(\fIon/off/toggle\fP)"
This action toggles the \fBsunFunctionKeys\fP resource and is also invoked by
-the \fBsun function-keys\fP entry in \fImainMenu\fP.
+the \fBsun\ function-keys\fP entry in \fImainMenu\fP.
.TP 8
.B "set-sun-keyboard(\fIon/off/toggle\fP)"
This action toggles the \fBsunKeyboard\fP resource and is also invoked by
@@ -2375,7 +2397,7 @@
!Lock Ctrl @Num_Lock <Btn2Down>:popup-menu(vtMenu) \\n\\
! @Num_Lock Ctrl <Btn2Down>:popup-menu(vtMenu) \\n\\
~Ctrl ~Meta <Btn2Down>:ignore() \\n\\
- Meta <Btn2Down>:clear-saved-lines() \n\
+ Meta <Btn2Down>:clear-saved-lines() \\n\\
~Ctrl ~Meta <Btn2Up>:insert-selection(PRIMARY, CUT_BUFFER0) \\n\\
!Ctrl <Btn3Down>:popup-menu(fontMenu) \\n\\
!Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \\n\\
@@ -2383,16 +2405,16 @@
! @Num_Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \\n\\
~Ctrl ~Meta <Btn3Down>:start-extend() \\n\\
~Meta <Btn3Motion>:select-extend() \\n\\
- Ctrl <Btn4Down>:scroll-back(1,halfpage) \\n\\
- Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \\n\\
- Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \\n\\
- @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \\n\\
- <Btn4Down>:scroll-back(5,line) \\n\\
- Ctrl <Btn5Down>:scroll-forw(1,halfpage) \\n\\
- Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \\n\\
- Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \\n\\
- @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \\n\\
- <Btn5Down>:scroll-forw(5,line) \\n\\
+ Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \\n\\
+ Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \\n\\
+ Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \\n\\
+ @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \\n\\
+ <Btn4Down>:scroll-back(5,line,m) \\n\\
+ Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \\n\\
+ Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \\n\\
+ Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \\n\\
+ @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \\n\\
+ <Btn5Down>:scroll-forw(5,line,m) \\n\\
<BtnUp>:select-end(PRIMARY, CUT_BUFFER0) \\n\\
<BtnDown>:bell(0)
.fi
Index: xtermcfg.hin
--- xterm-129+/xtermcfg.hin Wed Feb 9 17:47:18 2000
+++ xterm-130/xtermcfg.hin Tue Feb 29 21:01:43 2000
@@ -74,6 +74,7 @@
#undef OPT_MAXIMIZE /* CF_ARG_DISABLE(maximize) */
#undef OPT_NUM_LOCK /* CF_ARG_DISABLE(num-lock) */
#undef OPT_PC_COLORS /* CF_ARG_DISABLE(pc-color) */
+#undef OPT_SCO_FUNC_KEYS /* CF_ARG_ENABLE(sco-fkeys) */
#undef OPT_TEK4014 /* CF_ARG_DISABLE(tek4014) */
#undef OPT_TOOLBAR /* CF_ARG_ENABLE(toolbar) */
#undef OPT_TRACE /* CF_ARG_ENABLE(trace) */