XFree86 3.9Ad, 3.3.1e - xterm patch #67 - 1998/2/23 - T.Dickey This patch does the following: + improve test for highlightColor so that xterm does not attempt to use that unless it is different from the foreground and background colors (reported by Stefan Dalibor . I could not reproduce this until I noticed that the -rev option exposed it nicely. + remove ich and ich1 from xterm and xterm-8bit terminfo descriptions. SVr4 terminfo documents that you must not combine these with smir/rmir, but ncurses allows it, opening a hole. Solaris 2.6 vi does not work properly if it is using a terminfo description when these are combined, since it was written to accommodate old terminals that required it (reported by Stephen Marley). + restore 1-pixel overlap of scrollbar border with left edge of window (reported by Jim Burmeister ). + add a configure option, --enable-logfile-exec, which allows the user to specify a pipe for logfile. This defines ALLOWLOGFILEEXEC. + makes the ALLOWLOGFILEEXEC code compile & run, if configured. + minor documentation nits. -------------------------------------------------------------------------------- INSTALL | 6 aclocal.m4 | 2 configure | 406 +++++++++++++++++++++++++++++-------------------------- configure.in | 11 + misc.c | 76 +++++----- scrollbar.c | 6 terminfo | 14 + util.c | 11 - xterm.log.html | 53 +++++-- xtermcfg.hin | 1 10 files changed, 336 insertions, 250 deletions -------------------------------------------------------------------------------- Index: INSTALL --- xterm-66+/INSTALL Sun Oct 26 16:05:57 1997 +++ xterm-67/INSTALL Thu Feb 19 19:49:00 1998 @@ -39,11 +39,14 @@ --disable-color-mode disable default colorMode resource (default: on) --disable-doublechars disable support for double-size chars (default: on) --disable-echo test: display "compiling" commands (default: on) + --disable-highlighting disable support for color highlighting (default: on) --disable-i18n disable internationalization (default: on) --disable-imake disable use of imake for definitions (default: on) --disable-input-method disable input-method (default: on) - --disable-rightbar enable logging (default: on) + --disable-rightbar disable right-scrollbar support (default: on) + --disable-tek4014 disable tek4014 emulation (default: on) --disable-vt52 disable VT52 emulation (default: on) + --enable-logfile-exec enable exec'd logfile filter (default: off) --enable-logging enable logging (default: off) --enable-trace test: set to enable debugging traces (default: off) --enable-warnings test: turn on GCC compiler warnings (default: off) @@ -51,3 +54,4 @@ --with-Xaw3d link with Xaw 3d library --with-neXtaw link with neXT Athena library --with-terminal-id[=V] set default decTerminalID (default: vt100) + --with-terminal-type=T set default $TERM (default: xterm) Index: aclocal.m4 --- xterm-66+/aclocal.m4 Fri Feb 6 19:37:36 1998 +++ xterm-67/aclocal.m4 Thu Feb 19 19:48:46 1998 @@ -139,7 +139,7 @@ AC_DEFUN([CF_DISABLE_ECHO],[ AC_MSG_CHECKING(if you want to see long compiling messages) CF_ARG_DISABLE(echo, - [ --disable-echo test: display \"compiling\" commands], + [ --disable-echo test: display "compiling" commands], [ ECHO_LD='@echo linking [$]@;' RULE_CC=' @echo compiling [$]<' Index: configure --- xterm-66+/configure Fri Feb 6 19:37:41 1998 +++ xterm-67/configure Thu Feb 19 19:51:06 1998 @@ -200,11 +200,12 @@ --disable-input-method disable input-method (default: on) --disable-i18n disable internationalization (default: on) --enable-logging enable logging (default: off) + --enable-logfile-exec enable logfile via pipe (default: off) --disable-rightbar disable right-scrollbar support (default: on) --disable-tek4014 disable tek4014 emulation (default: on) --disable-vt52 disable VT52 emulation (default: on) --enable-trace test: set to enable debugging traces (default: off) - --disable-echo test: display \"compiling\" commands (default: on) + --disable-echo test: display "compiling" commands (default: on) --enable-xmc-glitch test: enable xmc magic-cookie emulation (default: off) --enable-warnings test: turn on GCC compiler warnings (default: off) EOF @@ -572,7 +573,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:576: checking host system type" >&5 +echo "configure:577: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -623,7 +624,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:627: checking for $ac_word" >&5 +echo "configure:628: 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 @@ -652,7 +653,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:656: checking for $ac_word" >&5 +echo "configure:657: 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 @@ -700,7 +701,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:705: 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. @@ -710,11 +711,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -734,12 +735,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:738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:739: 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:743: checking whether we are using GNU C" >&5 +echo "configure:744: 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 @@ -748,7 +749,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:752: \"$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:753: \"$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 @@ -763,7 +764,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:767: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:768: 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 @@ -791,7 +792,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:795: checking how to run the C preprocessor" >&5 +echo "configure:796: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -806,13 +807,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -823,13 +824,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -853,13 +854,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:857: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:858: 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 < Autoconf TIOCGETP @@ -877,7 +878,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -909,7 +910,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:913: checking for a BSD compatible install" >&5 +echo "configure:914: 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 @@ -961,9 +962,9 @@ ### checks for UNIX variants that set C preprocessor variables echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:965: checking for AIX" >&5 +echo "configure:966: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:989: checking for POSIXized ISC" >&5 +echo "configure:990: 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 @@ -1007,17 +1008,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1011: checking for minix/config.h" >&5 +echo "configure:1012: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1059,12 +1060,12 @@ ### checks for typedefs echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1063: checking for ANSI C header files" >&5 +echo "configure:1064: 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 < #include @@ -1072,7 +1073,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1089,7 +1090,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 @@ -1107,7 +1108,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 @@ -1128,7 +1129,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1139,7 +1140,7 @@ exit (0); } EOF -if { (eval echo configure:1143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1163,12 +1164,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1167: checking for size_t" >&5 +echo "configure:1168: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1196,12 +1197,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:1200: checking for time_t" >&5 +echo "configure:1201: 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 < #if STDC_HEADERS @@ -1237,12 +1238,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1241: checking for $ac_func" >&5 +echo "configure:1242: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1293,7 +1294,7 @@ if test ".$ac_cv_func_memmove" != .yes ; then if test ".$ac_cv_func_bcopy" = ".yes" ; then echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:1297: checking if bcopy does overlapping moves" >&5 +echo "configure:1298: 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 @@ -1302,7 +1303,7 @@ cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -1349,7 +1350,7 @@ echo $ac_n "checking for full tgetent function""... $ac_c" 1>&6 -echo "configure:1353: checking for full tgetent function" >&5 +echo "configure:1354: 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 @@ -1363,7 +1364,7 @@ echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5 cf_cv_lib_tgetent="-l$cf_termlib" @@ -1408,17 +1409,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1412: checking for $ac_hdr" >&5 +echo "configure:1413: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1451,7 +1452,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:1455: checking for partial tgetent function" >&5 +echo "configure:1456: 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 @@ -1460,14 +1461,14 @@ for cf_termlib in $cf_TERMLIB ; do LIBS="$cf_save_LIBS -l$cf_termlib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "there is a terminfo/tgetent in $cf_termlib" 1>&5 cf_cv_lib_part_tgetent="-l$cf_termlib" @@ -1490,17 +1491,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1494: checking for $ac_hdr" >&5 +echo "configure:1495: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1540,13 +1541,13 @@ ### checks for structures echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6 -echo "configure:1544: checking for declaration of fd_set" >&5 +echo "configure:1545: checking for declaration of fd_set" >&5 if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1554,7 +1555,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/types.h else @@ -1562,7 +1563,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1571,7 +1572,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/select.h else @@ -1596,12 +1597,12 @@ ### checks for compiler characteristics echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1600: checking for working const" >&5 +echo "configure:1601: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1672,7 +1673,7 @@ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1676: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1677: 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 @@ -1690,7 +1691,7 @@ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1739,17 +1740,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1743: checking for $ac_hdr" >&5 +echo "configure:1744: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1781,7 +1782,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:1785: checking for X" >&5 +echo "configure:1786: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -1844,12 +1845,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1918,14 +1919,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2025,7 +2026,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:2029: checking for open in -lc_s" >&5 +echo "configure:2030: 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 @@ -2033,7 +2034,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2061,7 +2062,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:2065: checking for gethostname in -lbsd" >&5 +echo "configure:2066: 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 @@ -2069,7 +2070,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2097,7 +2098,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:2101: checking for gethostname in -lnsl_s" >&5 +echo "configure:2102: 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 @@ -2105,7 +2106,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2133,7 +2134,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:2137: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:2138: 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 @@ -2141,7 +2142,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2169,7 +2170,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:2173: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:2174: 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 @@ -2177,7 +2178,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2229,7 +2230,7 @@ ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2233: checking for socket in -lsocket" >&5 +echo "configure:2234: 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 @@ -2237,7 +2238,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2276,7 +2277,7 @@ fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2280: checking for gethostname in -lnsl" >&5 +echo "configure:2281: 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 @@ -2284,7 +2285,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2346,17 +2347,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:2350: checking whether -R must be followed by a space" >&5 +echo "configure:2351: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2372,14 +2373,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2411,7 +2412,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:2415: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2416: 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 @@ -2419,7 +2420,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2452,7 +2453,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:2456: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2457: 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 @@ -2460,7 +2461,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2500,12 +2501,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:2504: checking for gethostbyname" >&5 +echo "configure:2505: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2549,7 +2550,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2553: checking for gethostbyname in -lnsl" >&5 +echo "configure:2554: 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 @@ -2557,7 +2558,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2598,12 +2599,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:2602: checking for connect" >&5 +echo "configure:2603: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2647,7 +2648,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2651: checking for connect in -lsocket" >&5 +echo "configure:2652: 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 @@ -2655,7 +2656,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2690,12 +2691,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:2694: checking for remove" >&5 +echo "configure:2695: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2739,7 +2740,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2743: checking for remove in -lposix" >&5 +echo "configure:2744: 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 @@ -2747,7 +2748,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2782,12 +2783,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2786: checking for shmat" >&5 +echo "configure:2787: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2831,7 +2832,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2835: checking for shmat in -lipc" >&5 +echo "configure:2836: 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 @@ -2839,7 +2840,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2883,7 +2884,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:2887: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2888: 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 @@ -2891,7 +2892,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2929,7 +2930,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2933: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2934: 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 @@ -2937,7 +2938,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2969,7 +2970,7 @@ fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2973: checking for XtAppInitialize in -lXt" >&5 +echo "configure:2974: 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 @@ -2977,7 +2978,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3044,17 +3045,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3048: checking for $ac_hdr" >&5 +echo "configure:3049: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3104,17 +3105,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3108: checking for $ac_hdr" >&5 +echo "configure:3109: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3142,7 +3143,7 @@ echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:3146: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:3147: checking for XmuClientWindow in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3150,7 +3151,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3188,7 +3189,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6 -echo "configure:3192: checking for XmuClientWindow in -lXmu_s" >&5 +echo "configure:3193: checking for XmuClientWindow in -lXmu_s" >&5 ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3196,7 +3197,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3238,7 +3239,7 @@ echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3242: checking for XextCreateExtension in -lXext" >&5 +echo "configure:3243: 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 @@ -3246,7 +3247,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3279,7 +3280,7 @@ echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6 -echo "configure:3283: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 +echo "configure:3284: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 ac_lib_var=`echo $cf_x_athena'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3287,7 +3288,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$cf_x_athena $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3318,7 +3319,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s""... $ac_c" 1>&6 -echo "configure:3322: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 +echo "configure:3323: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 ac_lib_var=`echo ${cf_x_athena}_s'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3326,7 +3327,7 @@ ac_save_LIBS="$LIBS" LIBS="-l${cf_x_athena}_s $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3378,12 +3379,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3382: checking for $ac_func" >&5 +echo "configure:3383: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3432,7 +3433,7 @@ echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6 -echo "configure:3436: checking if we should use imake to help" >&5 +echo "configure:3437: 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 @@ -3457,7 +3458,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:3461: checking for $ac_word" >&5 +echo "configure:3462: 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 @@ -3589,7 +3590,7 @@ echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6 -echo "configure:3593: checking for default terminal-id" >&5 +echo "configure:3594: 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 @@ -3610,7 +3611,7 @@ echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6 -echo "configure:3614: checking for default terminal-type" >&5 +echo "configure:3615: 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 @@ -3628,7 +3629,7 @@ ### checks for optional features echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6 -echo "configure:3632: checking if you want active-icons" >&5 +echo "configure:3633: 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 @@ -3654,7 +3655,7 @@ fi echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6 -echo "configure:3658: checking if you want ANSI color" >&5 +echo "configure:3659: 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 @@ -3678,7 +3679,7 @@ echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6 -echo "configure:3682: checking if you want 16 colors like aixterm" >&5 +echo "configure:3683: 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 @@ -3702,7 +3703,7 @@ echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6 -echo "configure:3706: checking if you want bold colors mapped like IBM PC" >&5 +echo "configure:3707: 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 @@ -3726,7 +3727,7 @@ echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6 -echo "configure:3730: checking if you want color-mode enabled by default" >&5 +echo "configure:3731: 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 @@ -3750,7 +3751,7 @@ echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6 -echo "configure:3754: checking if you want support for color highlighting" >&5 +echo "configure:3755: 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 @@ -3774,7 +3775,7 @@ echo $ac_n "checking for doublesize characters""... $ac_c" 1>&6 -echo "configure:3778: checking for doublesize characters" >&5 +echo "configure:3779: checking for doublesize characters" >&5 # Check whether --enable-doublechars or --disable-doublechars was given. if test "${enable_doublechars+set}" = set; then @@ -3798,7 +3799,7 @@ echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6 -echo "configure:3802: checking if you want support for input-method" >&5 +echo "configure:3803: 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 @@ -3824,7 +3825,7 @@ fi echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6 -echo "configure:3828: checking if you want support for internationalization" >&5 +echo "configure:3829: checking if you want support for internationalization" >&5 # Check whether --enable-i18n or --disable-i18n was given. if test "${enable_i18n+set}" = set; then @@ -3850,7 +3851,7 @@ fi echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6 -echo "configure:3854: checking if you want support for logging" >&5 +echo "configure:3855: checking if you want support for logging" >&5 # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then @@ -3873,10 +3874,35 @@ #define ALLOWLOGGING 1 EOF + echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6 +echo "configure:3879: 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 + enableval="$enable_logfile_exec" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_log_exec=yes + else + enable_log_exec=no + fi +else + enableval=no + enable_log_exec=no + +fi + + echo "$ac_t""$enable_log_exec" 1>&6 + if test $enable_log_exec = yes ; then + cat >> confdefs.h <<\EOF +#define ALLOWLOGFILEEXEC 1 +EOF + + fi fi echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6 -echo "configure:3880: checking if you want support for right-scrollbar" >&5 +echo "configure:3906: 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 @@ -3902,7 +3928,7 @@ fi echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6 -echo "configure:3906: checking if you want support for tek4014" >&5 +echo "configure:3932: checking if you want support for tek4014" >&5 # Check whether --enable-tek4014 or --disable-tek4014 was given. if test "${enable_tek4014+set}" = set; then @@ -3932,7 +3958,7 @@ fi echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6 -echo "configure:3936: checking if you want VT52 emulation" >&5 +echo "configure:3962: checking if you want VT52 emulation" >&5 # Check whether --enable-vt52 or --disable-vt52 was given. if test "${enable_vt52+set}" = set; then @@ -3957,7 +3983,7 @@ # development/testing aids echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6 -echo "configure:3961: checking if you want debugging traces" >&5 +echo "configure:3987: checking if you want debugging traces" >&5 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then @@ -3986,7 +4012,7 @@ echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3990: checking if you want to see long compiling messages" >&5 +echo "configure:4016: 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 @@ -4026,7 +4052,7 @@ echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6 -echo "configure:4030: checking if you want magic cookie emulation" >&5 +echo "configure:4056: 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 @@ -4055,7 +4081,7 @@ if test -n "$GCC" ; then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:4059: checking if you want to turn on gcc warnings" >&5 +echo "configure:4085: 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 @@ -4095,9 +4121,9 @@ if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:4099: checking for gcc __attribute__ directives" >&5 +echo "configure:4125: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4165: \"$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 @@ -4152,11 +4178,11 @@ if test -n "$GCC" then cat > conftest.$ac_ext <&6 -echo "configure:4160: checking for gcc warning options" >&5 +echo "configure:4186: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -4174,7 +4200,7 @@ Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4204: \"$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-66+/configure.in Mon Jan 26 18:30:53 1998 +++ xterm-67/configure.in Thu Feb 19 19:51:47 1998 @@ -27,7 +27,7 @@ dnl --------------------------------------------------------------------------- dnl Process this file with autoconf to produce a configure script. dnl -AC_PREREQ(2.12) +AC_PREREQ(2.12.971230) AC_INIT(charproc.c) AC_CONFIG_HEADER(xtermcfg.h:xtermcfg.hin) CF_CHECK_CACHE @@ -216,6 +216,15 @@ AC_MSG_RESULT($enable_logging) if test $enable_logging = yes ; then AC_DEFINE(ALLOWLOGGING) + AC_MSG_CHECKING(if you want to allow logging via a pipe) + CF_ARG_ENABLE(logfile-exec, + [ --enable-logfile-exec enable exec'd logfile filter], + [enable_log_exec=yes], + [enable_log_exec=no]) + AC_MSG_RESULT($enable_log_exec) + if test $enable_log_exec = yes ; then + AC_DEFINE(ALLOWLOGFILEEXEC) + fi fi AC_MSG_CHECKING(if you want support for right-scrollbar) Index: misc.c --- xterm-66+/misc.c Sun Jan 25 09:19:53 1998 +++ xterm-67/misc.c Thu Feb 19 20:42:58 1998 @@ -607,12 +607,30 @@ #endif #ifdef ALLOWLOGGING + /* - * logging is a security hole, since it allows a setuid program to - * write arbitrary data to an arbitrary file. So it is disabled - * by default. + * Logging is a security hole, since it allows a setuid program to write + * arbitrary data to an arbitrary file. So it is disabled by default. + * (However, this version of xterm resets the setuid before opening the + * logfile). */ +#ifdef ALLOWLOGFILEEXEC +static SIGNAL_T logpipe PROTO((int sig)); + +static SIGNAL_T logpipe (sig) + int sig GCC_UNUSED; +{ + register TScreen *screen = &term->screen; + +#ifdef SYSV + (void) signal(SIGPIPE, SIG_IGN); +#endif /* SYSV */ + if(screen->logging) + CloseLog(screen); +} +#endif /* ALLOWLOGFILEEXEC */ + void StartLog(screen) register TScreen *screen; @@ -621,7 +639,6 @@ #ifdef ALLOWLOGFILEEXEC register char *cp; register int i; - void logpipe(); #ifdef SYSV /* SYSV has another pointer which should be part of the ** FILE structure but is actually a separate array. @@ -655,42 +672,43 @@ */ int p[2]; static char *shell; + register struct passwd *pw; if(pipe(p) < 0 || (i = fork()) < 0) return; if(i == 0) { /* child */ + /* + * Close our output (we won't be talking back to the + * parent), and redirect our child's output to the + * original stderr. + */ close(p[1]); dup2(p[0], 0); close(p[0]); dup2(fileno(stderr), 1); dup2(fileno(stderr), 2); -#ifdef SYSV - old_bufend = _bufend(stderr); -#endif /* SYSV */ + close(fileno(stderr)); - stderr->_file = 2; -#ifdef SYSV - _bufend(stderr) = old_bufend; -#endif /* SYSV */ close(ConnectionNumber(screen->display)); close(screen->respond); - if(!shell) { - register struct passwd *pw; - struct passwd *getpwuid(); - - if(((cp = getenv("SHELL")) == NULL || *cp == 0) - && ((pw = getpwuid(screen->uid)) == NULL || - *(cp = pw->pw_shell) == 0) || - (shell = malloc((unsigned) strlen(cp) + 1)) == NULL) - shell = "/bin/sh"; - else - strcpy(shell, cp); - } + + if ((((cp = getenv("SHELL")) == NULL || *cp == 0) + && ((pw = getpwuid(screen->uid)) == NULL + || *(cp = pw->pw_shell) == 0)) + || (shell = malloc(strlen(cp) + 1)) == NULL) + shell = "/bin/sh"; + else + strcpy(shell, cp); + signal(SIGHUP, SIG_DFL); signal(SIGCHLD, SIG_DFL); + + /* (this is redundant) */ setgid(screen->gid); setuid(screen->uid); + execl(shell, shell, "-c", &screen->logfile[1], 0); + fprintf(stderr, "%s: Can't exec `%s'\n", xterm_name, &screen->logfile[1]); exit(ERROR_LOGEXEC); @@ -749,18 +767,6 @@ screen->logstart = CURRENT_EMU_VAL(screen, Tbuffer, buffer); } -#ifdef ALLOWLOGFILEEXEC -void logpipe() -{ - register TScreen *screen = &term->screen; - -#ifdef SYSV - (void) signal(SIGPIPE, SIG_IGN); -#endif /* SYSV */ - if(screen->logging) - CloseLog(screen); -} -#endif /* ALLOWLOGFILEEXEC */ #endif /* ALLOWLOGGING */ void Index: scrollbar.c --- xterm-66+/scrollbar.c Sun Jan 11 11:57:36 1998 +++ xterm-67/scrollbar.c Thu Feb 19 19:59:00 1998 @@ -278,11 +278,11 @@ ? (screen->fullVwin.fullwidth - screen->scrollWidget->core.width - screen->scrollWidget->core.border_width) - : 0, + : -1, #else - 0, + -1, #endif - 0, + -1, screen->scrollWidget->core.width, screen->fullVwin.height + screen->border * 2, screen->scrollWidget->core.border_width); Index: terminfo --- xterm-66+/terminfo Sat Feb 14 22:05:37 1998 +++ xterm-67/terminfo Mon Feb 23 22:09:04 1998 @@ -1,6 +1,9 @@ # $XConsortium: terminfo,v 1.11 94/10/13 21:24:31 gildea Exp $ # $XFree86: xc/programs/xterm/terminfo,v 3.20 1998/01/24 01:53:40 hohndel Exp $ # +# XFree86 updates/notes/new entries (including xterm-8bit, xterm-16color) +# - Thomas E. Dickey +# # meml locks memory above the cursor; memu unlocks (ala HP terminals) # rmcup clears memory before switching to the alternate screen. The older # (deprecated) \E[?47h did not do this, requiring applications to @@ -8,6 +11,13 @@ # be disabled via titeInhibit, making that resource not function as # intended on systems with terminfo. # +# We could have used ich=\E[%p1%d@, ich1=\E[@, which work with ncurses, but +# that is not standard behavior. If they are set, then SVr4 vi (e.g., Solaris +# 2.6) emits both smir/rmir and ich1. +# +# The xterm-r6 entry does not define acsc, which is probably an error (but +# it matches the X11R5 to X11R6.3 distributions). +# xterm|xterm-24|xterms|vs100|xterm terminal emulator (X Window System), am, bce, @@ -54,8 +64,6 @@ hpa=\E[%i%p1%dG, ht=^I, hts=\EH, - ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, @@ -257,8 +265,6 @@ hpa=\233%i%p1%dG, ht=^I, hts=\210, - ich=\233%p1%d@, - ich1=\233@, il=\233%p1%dL, il1=\233L, ind=^J, Index: util.c --- xterm-66+/util.c Thu Feb 5 20:20:22 1998 +++ xterm-67/util.c Mon Feb 23 21:37:53 1998 @@ -1455,12 +1455,15 @@ gc = ReverseGC(screen); #if OPT_HIGHLIGHT_COLOR - XSetForeground(screen->display, gc, hi_pix ? fg_pix : bg_pix); - XSetBackground(screen->display, gc, hi_pix ? hi_pix : fg_pix); -#else + if (hi_pix != screen->foreground + && hi_pix != fg_pix + && hi_pix != bg_pix) { + bg_pix = fg_pix; + fg_pix = hi_pix; + } +#endif XSetForeground(screen->display, gc, bg_pix); XSetBackground(screen->display, gc, fg_pix); -#endif } else { if (flags & (BOLD|BLINK)) gc = NormalBoldGC(screen); Index: xterm.log.html --- xterm-66+/xterm.log.html Mon Feb 16 18:53:41 1998 +++ xterm-67/xterm.log.html Mon Feb 23 22:20:44 1998 @@ -20,7 +20,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ***************************************************************************** - $XFree86$ + $XFree86: xc/programs/xterm/xterm.log.html,v 1.1.2.1 1998/02/15 16:10:14 hohndel Exp $ --> @@ -41,6 +41,7 @@ xc/programs/Xserver/hw/xfree86). +

Patch #67 - 1998/2/23 - XFree86 3.9Ad and 3.3.1e

+ +This patch does the following: +
    +
  • improve test for highlightColor so that xterm does not attempt to + use that unless it is different from the foreground and background + colors (reported by Stefan Dalibor + <Stefan.Dalibor@informatik.uni-erlangen.de>. +

    + I could not reproduce this until I noticed that the -rev option + exposed it nicely. + +

  • remove ich and ich1 from xterm and xterm-8bit terminfo descriptions. + SVr4 terminfo documents that you must not combine these with + smir/rmir, but ncurses allows it, opening a hole. Solaris 2.6 vi + does not work properly if it is using a terminfo description when + these are combined, since it was written to accommodate old terminals + that required it (reported by Stephen Marley). + +
  • restore 1-pixel overlap of scrollbar border with left edge of window + (reported by Jim Burmeister <jimb@metrolink.com>). + +
  • add a configure option, --enable-logfile-exec, which allows the + user to specify a pipe for logfile. This defines ALLOWLOGFILEEXEC. + +
  • makes the ALLOWLOGFILEEXEC code compile & run, if configured. + +
  • minor documentation nits. +
+

Patch #66 - 1998/2/16 - XFree86 3.9Ad and 3.3.1d

This fixes the problem reported with failure to build the resize @@ -133,7 +164,7 @@ This fixes the following problems with xterm:
  • save/restore the ANSI foreground and background colors with the other - visible attributes in the save-cursor and restore-cursor operations. + visible attributes in the save-cursor and restore-cursor operations. This works around a problem with vim, which apparently assumed that switching between the normal and alternate screens resets the colors (reported by Jim Battle <jb@chromatic.com>). @@ -157,7 +188,7 @@
  • adds some detail to the man-page (requested by Jason Bacon <acadix@execpc.com>) - +
  • modify the standalone configure script to ignore the broken nsl and socket libraries on IRIX 6.2 (the ones on 5.2 also are broken, so this change just widens the check for the system version number). @@ -248,7 +279,7 @@
  • corrected missing save-cursor logic in the handling of SGR 1048 - (the new control sequence I added in patch #54, 1997/10/17). + (the new control sequence I added in patch #54, 1997/10/17). Reported by Darren Hiebert.
  • flush the output of the transparent printing after each line @@ -269,7 +300,7 @@

    Patch #59 - 1998/1/5 - XFree86 3.9Ab

    My last patch has an off-by-one error in the comparison for argc. Douglas -Kosovic <douglask@dstc.edu.au> showed me where (he got a core dump). +Kosovic <douglask@dstc.edu.au> showed me where (he got a core dump). Also, I think this explains Clint Olsen's problem, but the symptoms were more subtle (EINVAL for a system call if the -display option is omitted). @@ -505,7 +536,7 @@ by invoking setuid just before the main loop.
  • add an ifdef'd include for <sys/termio.h> for HP-UX, which allows - the program to process SIGWINCH events (this is a bug in X11R6.3) + the program to process SIGWINCH events (this is a bug in X11R6.3)
  • add state-table entries for VT52 emulation to enter/exit keypad application mode. @@ -757,7 +788,7 @@

    Patch #33 - 1996/11/24 - XFree86 3.2

    This adds to the reset-fix by Matthieu Herrb <Mathieu.Herrb@mipnet.fr> a -small change to make xterm able to output 8-bit characters in VT100 mode. +small change to make xterm able to output 8-bit characters in VT100 mode. Applications that run on real VT100's don't do that anyway, and this feature should be removed sometime after finishing off the VT220 emulation (VT220's can @@ -886,7 +917,7 @@

    Patch #23 - 1996/7/31 - XFree86 3.1.2Ec

    -This removes the blinking cursor I added last week (for performance reasons). +This removes the blinking cursor I added last week (for performance reasons). Time-permitting, I'll revisit this after 3.2 is released (there will be more work after XFree86 3.2, I assume). @@ -1045,7 +1076,7 @@
  • in both, corrected home/end keys to match the code correction made by Thomas Mueller in 3.1.2Bk - + => (I'm still considering modifying the code & description to match the rxvt program). @@ -1169,7 +1200,7 @@
  • add interpretation of codes 39, 49, to reset background and foreground to default value (I'm told that ISO 6429 does this; but I - don't have a written reference -- yet -- can anyone help here?). + don't have a written reference -- yet -- can anyone help here?). Anyway, rxvt does it, and it'll solve my remaining color management problems. @@ -1230,7 +1261,7 @@ portions of ScrnInsertLine() and ScrnDeleteLine(). The new function uses the SGR fg/bg colors if they're set. - +

    => Otherwise, selection after an index or reverse index will paint the wrong colors. Index: xtermcfg.hin --- xterm-66+/xtermcfg.hin Mon Feb 16 17:06:33 1998 +++ xterm-67/xtermcfg.hin Thu Feb 19 19:43:17 1998 @@ -30,6 +30,7 @@ /* This is a template for */ #undef ALLOWLOGGING /* CF_ARG_ENABLE(enable-logging) */ +#undef ALLOWLOGFILEEXEC /* CF_ARG_ENABLE(enable-logfile-exec) */ #undef CC_HAS_PROTOS /* CF_ANSI_CC */ #undef DFT_COLORMODE /* AC_ARG_WITH(default-color-mode) */ #undef DFT_DECID /* AC_ARG_WITH(default-terminal-id) */