XFree86 3.9Ah - xterm patch #75 - T.Dickey This incorporates fixes from several people, as well as some improvements that I made based on feedback from users: + add option to standalone configure script, "--with-own-terminfo-dir", which causes xterm to pass a predefined value of $TERMINFO to the application. Also use this value in install rule "make install-ti", for the standalone configure script. (patch & feedback from Tor Lillqvist ) + change ifdef's for "hpux" to "__hpux" (patch by Tor Lillqvist). The imake configuration uses the former, but the latter is predefined by HP's compilers. + define USE_SYSV_ENVVARS for HP-UX, curses does not use $TERMCAP (patch by Tor Lillqvist). + on HP-UX, use the /dev/ptym/clone device to allocate ptys. Works both on HP-UX 9 and 10. (patch by Tor Lillqvist). + modify configure script to obtain the $(EXTRA_LOADFLAGS) value from imake, needed for compiling under DEC OSF/1 (reported by Stefan Dalibor) + modify print-window action so that the printer is closed after printing a window, unless the printer was already opened (i.e., by an application running in the window). This makes the printing complete without having to exit xterm, since not all systems treat fflush through a pipe very well (reported by Stefan Dalibor) + modify printing code so that the ^M's are not printed if the printAttribute resource is set to zero (request by Stefan Dalibor). + correct typo in xterm.man, for the default value of printAttribute (reported by Stefan Dalibor). + correct printing code so that the alternate character set is printed, like other attributes, with escape sequences. + correct termcap description, removing spurious 'm' character from the 'op' capability (reported by Greg Woods ). + correct trace code so that the initial timestamp is set. + correct/modify utmp data for the Linux glibc 2 configuration, so that the ut_line member is set before using it to update wtmp (patch by Bill Nottingham ). # ------------------------------------------------------------------------------ # INSTALL | 1 # Makefile.in | 11 + # aclocal.m4 | 2 # configure | 437 +++++++++++++++++++++++++++++-------------------------- # configure.in | 15 + # main.c | 39 +++- # print.c | 56 ++++++- # ptyx.h | 24 +-- # termcap | 2 # trace.c | 3 # version.h | 2 # xterm.log.html | 52 ++++++ # xterm.man | 2 # xtermcfg.hin | 1 # 14 files changed, 407 insertions, 240 deletions # ------------------------------------------------------------------------------ Index: INSTALL --- xterm-74+/INSTALL Tue Apr 28 15:01:01 1998 +++ xterm-75/INSTALL Wed May 6 20:01:09 1998 @@ -55,5 +55,6 @@ --enable-xmc-glitch test: enable xmc magic-cookie emulation (default: off) --with-Xaw3d link with Xaw 3d library --with-neXtaw link with neXT Athena library + --with-own-terminfo=P set default $TERMINFO (default: from environment) --with-terminal-id[=V] set default decTerminalID (default: vt100) --with-terminal-type=T set default $TERM (default: xterm) Index: Makefile.in --- xterm-74+/Makefile.in Sun Apr 5 23:48:23 1998 +++ xterm-75/Makefile.in Thu May 7 06:10:35 1998 @@ -17,6 +17,7 @@ IMAKE_CFLAGS = @IMAKE_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@ +EXTRA_LOADFLAGS = @IMAKE_LOADFLAGS@ CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H $(X_CFLAGS) $(IMAKE_CFLAGS) CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS) @@ -76,7 +77,7 @@ main.o: version.h xterm : $(OBJS1) - $(LINK) $(LDFLAGS) -o $@ $(OBJS1) $(X_LIBS) $(LIBS) + $(LINK) $(LDFLAGS) -o $@ $(OBJS1) $(X_LIBS) $(LIBS) $(EXTRA_LOADFLAGS) resize : $(OBJS2) $(LINK) $(LDFLAGS) -o $@ $(OBJS2) $(X_LIBS) $(LIBS) @@ -86,7 +87,11 @@ $(INSTALL_PROGRAM) -s -m 755 resize $(bindir)/resize $(INSTALL_DATA) xterm.man $(mandir)/xterm.$(manext) $(INSTALL_DATA) resize.man $(mandir)/resize.$(manext) - @echo 'Completed installation.' + @echo 'Completed installation of executables and documentation.' + @echo 'Use "make install-ti" to install terminfo description.' + +install-ti: + TERMINFO=@private_TERMINFO@ tic terminfo installdirs: $(INSTALL_DIRS) @@ -97,7 +102,7 @@ $(mandir)/resize.$(manext) mostlyclean: - -$(RM) *.[oi] XtermLog.* .pure core *~ *.BAK *.out + -$(RM) *.[ois] XtermLog.* .pure core *~ *.BAK *.out clean: mostlyclean -$(RM) $(PROGRAMS) Index: aclocal.m4 --- xterm-74+/aclocal.m4 Tue Apr 28 15:01:01 1998 +++ xterm-75/aclocal.m4 Wed May 6 18:58:44 1998 @@ -466,6 +466,7 @@ cat >> ./Imakefile <<'CF_EOF' findstddefs: @echo 'IMAKE_CFLAGS="${ALLDEFINES} ifelse($1,,,$1)"' + @echo 'IMAKE_LOADFLAGS="${EXTRA_LOADFLAGS} ifelse($2,,,$2)"' CF_EOF if ( $IMAKE $cf_imake_opts 1>/dev/null 2>&AC_FD_CC && test -f Makefile) then @@ -541,6 +542,7 @@ fi fi AC_SUBST(IMAKE_CFLAGS) +AC_SUBST(IMAKE_LOADFLAGS) ])dnl dnl --------------------------------------------------------------------------- dnl On both Ultrix and CLIX, I find size_t defined in Index: configure --- xterm-74+/configure Tue Apr 28 15:01:01 1998 +++ xterm-75/configure Thu May 7 18:09:31 1998 @@ -188,15 +188,16 @@ --disable-imake disable use of imake for definitions (default: on) --with-terminal-id[=V] set default decTerminalID (default: vt100) --with-terminal-type=T set default \$TERM (default: xterm) + --with-own-terminfo=P set default \$TERMINFO (default: from environment) --disable-active-icon disable X11R6.3 active-icon feature (default: on) --disable-ansi-color disable ANSI color (default: on) --disable-16-color disable 16-color support (default: on) --disable-bold-color disable PC-style mapping of bold colors (default: on) --disable-color-mode disable default colorMode resource (default: on) --disable-highlighting disable support for color highlighting (default: on) - --disable-doublechars disable support for double-size chars (default: on) EOF cat <&6 -echo "configure:581: checking host system type" >&5 +echo "configure:582: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -628,7 +629,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:632: checking for $ac_word" >&5 +echo "configure:633: 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 @@ -657,7 +658,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:661: checking for $ac_word" >&5 +echo "configure:662: 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 @@ -705,7 +706,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:709: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:710: 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. @@ -715,11 +716,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:724: \"$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 @@ -739,12 +740,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:743: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:744: 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:748: checking whether we are using GNU C" >&5 +echo "configure:749: 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 @@ -753,7 +754,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:757: \"$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:758: \"$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 @@ -768,7 +769,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:772: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:773: 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 @@ -796,7 +797,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:800: checking how to run the C preprocessor" >&5 +echo "configure:801: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -811,13 +812,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:821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -828,13 +829,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:838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -858,13 +859,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:862: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:863: 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 @@ -882,7 +883,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -914,7 +915,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:918: checking for a BSD compatible install" >&5 +echo "configure:919: 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 @@ -966,9 +967,9 @@ ### checks for UNIX variants that set C preprocessor variables echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:970: checking for AIX" >&5 +echo "configure:971: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:994: checking for POSIXized ISC" >&5 +echo "configure:995: 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 @@ -1012,17 +1013,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1016: checking for minix/config.h" >&5 +echo "configure:1017: 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:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1065,17 +1066,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1069: checking for $ac_hdr" >&5 +echo "configure:1070: 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:1079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1105,13 +1106,13 @@ ### checks for typedefs echo $ac_n "checking for size_t in or ""... $ac_c" 1>&6 -echo "configure:1109: checking for size_t in or " >&5 +echo "configure:1110: checking for size_t in or " >&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 < @@ -1124,7 +1125,7 @@ size_t x ; return 0; } EOF -if { (eval echo configure:1128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_size_t=yes else @@ -1144,12 +1145,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1148: checking for ANSI C header files" >&5 +echo "configure:1149: 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 @@ -1157,7 +1158,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1174,7 +1175,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 @@ -1192,7 +1193,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 @@ -1213,7 +1214,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1224,7 +1225,7 @@ exit (0); } EOF -if { (eval echo configure:1228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1248,12 +1249,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:1252: checking for time_t" >&5 +echo "configure:1253: 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 @@ -1290,12 +1291,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1294: checking for $ac_func" >&5 +echo "configure:1295: 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:1323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1346,7 +1347,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:1350: checking if bcopy does overlapping moves" >&5 +echo "configure:1351: 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 @@ -1355,7 +1356,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:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -1402,7 +1403,7 @@ echo $ac_n "checking for full tgetent function""... $ac_c" 1>&6 -echo "configure:1406: checking for full tgetent function" >&5 +echo "configure:1407: 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 @@ -1416,7 +1417,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:1435: \"$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" @@ -1461,17 +1462,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1465: checking for $ac_hdr" >&5 +echo "configure:1466: 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:1475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1504,7 +1505,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:1508: checking for partial tgetent function" >&5 +echo "configure:1509: 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 @@ -1513,14 +1514,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:1525: \"$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" @@ -1543,17 +1544,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1547: checking for $ac_hdr" >&5 +echo "configure:1548: 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:1557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1593,13 +1594,13 @@ ### checks for structures echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6 -echo "configure:1597: checking for declaration of fd_set" >&5 +echo "configure:1598: 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 < @@ -1607,7 +1608,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/types.h else @@ -1615,7 +1616,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1624,7 +1625,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/select.h else @@ -1651,13 +1652,13 @@ echo $ac_n "checking declaration of errno""... $ac_c" 1>&6 -echo "configure:1655: checking declaration of errno" >&5 +echo "configure:1656: checking declaration of errno" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'errno'=yes' else @@ -1700,9 +1701,9 @@ EOF echo $ac_n "checking existence of errno""... $ac_c" 1>&6 -echo "configure:1704: checking existence of errno" >&5 +echo "configure:1705: checking existence of errno" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval 'cf_cv_have_'errno'=yes' else @@ -1743,12 +1744,12 @@ ### checks for compiler characteristics echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1747: checking for working const" >&5 +echo "configure:1748: 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:1802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1819,7 +1820,7 @@ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1823: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1824: 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 @@ -1843,7 +1844,7 @@ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1889,12 +1890,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:1893: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1894: 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 < #include @@ -1910,7 +1911,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1936,7 +1937,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:1940: checking for X" >&5 +echo "configure:1941: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -1999,12 +2000,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:2008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2073,14 +2074,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:2085: \"$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. @@ -2180,7 +2181,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:2184: checking for open in -lc_s" >&5 +echo "configure:2185: 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 @@ -2188,7 +2189,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:2204: \"$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 @@ -2216,7 +2217,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:2220: checking for gethostname in -lbsd" >&5 +echo "configure:2221: 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 @@ -2224,7 +2225,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:2240: \"$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 @@ -2252,7 +2253,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:2256: checking for gethostname in -lnsl_s" >&5 +echo "configure:2257: 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 @@ -2260,7 +2261,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:2276: \"$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 @@ -2288,7 +2289,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:2292: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:2293: 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 @@ -2296,7 +2297,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:2312: \"$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 @@ -2324,7 +2325,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:2328: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:2329: 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 @@ -2332,7 +2333,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:2348: \"$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 @@ -2384,7 +2385,7 @@ ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2388: checking for socket in -lsocket" >&5 +echo "configure:2389: 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 @@ -2392,7 +2393,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:2408: \"$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 @@ -2431,7 +2432,7 @@ fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2435: checking for gethostname in -lnsl" >&5 +echo "configure:2436: 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 @@ -2439,7 +2440,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:2455: \"$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 @@ -2501,17 +2502,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:2505: checking whether -R must be followed by a space" >&5 +echo "configure:2506: 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:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2527,14 +2528,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:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2566,7 +2567,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:2570: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2571: 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 @@ -2574,7 +2575,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:2590: \"$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 @@ -2607,7 +2608,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:2611: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2612: 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 @@ -2615,7 +2616,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:2631: \"$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 @@ -2655,12 +2656,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:2659: checking for gethostbyname" >&5 +echo "configure:2660: 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:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2704,7 +2705,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2708: checking for gethostbyname in -lnsl" >&5 +echo "configure:2709: 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 @@ -2712,7 +2713,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:2728: \"$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 @@ -2753,12 +2754,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:2757: checking for connect" >&5 +echo "configure:2758: 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:2786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2802,7 +2803,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2806: checking for connect in -lsocket" >&5 +echo "configure:2807: 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 @@ -2810,7 +2811,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:2826: \"$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 @@ -2845,12 +2846,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:2849: checking for remove" >&5 +echo "configure:2850: 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:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2894,7 +2895,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2898: checking for remove in -lposix" >&5 +echo "configure:2899: 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 @@ -2902,7 +2903,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:2918: \"$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 @@ -2937,12 +2938,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2941: checking for shmat" >&5 +echo "configure:2942: 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:2970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2986,7 +2987,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2990: checking for shmat in -lipc" >&5 +echo "configure:2991: 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 @@ -2994,7 +2995,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:3010: \"$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 @@ -3038,7 +3039,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:3042: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3043: 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 @@ -3046,7 +3047,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:3062: \"$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 @@ -3084,7 +3085,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:3088: checking for XOpenDisplay in -lX11" >&5 +echo "configure:3089: 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 @@ -3092,7 +3093,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:3108: \"$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 @@ -3124,7 +3125,7 @@ fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:3128: checking for XtAppInitialize in -lXt" >&5 +echo "configure:3129: 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 @@ -3132,7 +3133,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:3148: \"$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 @@ -3199,17 +3200,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3203: checking for $ac_hdr" >&5 +echo "configure:3204: 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:3213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3259,17 +3260,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3263: checking for $ac_hdr" >&5 +echo "configure:3264: 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:3273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3297,7 +3298,7 @@ echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:3301: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:3302: 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 @@ -3305,7 +3306,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:3321: \"$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 @@ -3343,7 +3344,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6 -echo "configure:3347: checking for XmuClientWindow in -lXmu_s" >&5 +echo "configure:3348: 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 @@ -3351,7 +3352,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:3367: \"$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 @@ -3393,7 +3394,7 @@ echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3397: checking for XextCreateExtension in -lXext" >&5 +echo "configure:3398: 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 @@ -3401,7 +3402,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:3417: \"$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 @@ -3434,7 +3435,7 @@ echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6 -echo "configure:3438: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 +echo "configure:3439: 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 @@ -3442,7 +3443,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:3458: \"$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 @@ -3473,7 +3474,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:3477: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 +echo "configure:3478: 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 @@ -3481,7 +3482,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:3497: \"$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 @@ -3533,12 +3534,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3537: checking for $ac_func" >&5 +echo "configure:3538: 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:3566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3587,7 +3588,7 @@ echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6 -echo "configure:3591: checking if we should use imake to help" >&5 +echo "configure:3592: 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 @@ -3612,7 +3613,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:3616: checking for $ac_word" >&5 +echo "configure:3617: 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 @@ -3661,6 +3662,7 @@ cat >> ./Imakefile <<'CF_EOF' findstddefs: @echo 'IMAKE_CFLAGS="${ALLDEFINES} $(MAIN_DEFINES)"' + @echo 'IMAKE_LOADFLAGS="${EXTRA_LOADFLAGS} "' CF_EOF if ( $IMAKE $cf_imake_opts 1>/dev/null 2>&5 && test -f Makefile) then @@ -3740,11 +3742,12 @@ fi + fi echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6 -echo "configure:3748: checking for default terminal-id" >&5 +echo "configure:3751: 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 @@ -3765,7 +3768,7 @@ echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6 -echo "configure:3769: checking for default terminal-type" >&5 +echo "configure:3772: 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 @@ -3781,9 +3784,33 @@ EOF +echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6 +echo "configure:3789: 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 + withval="$with_own_terminfo" + private_TERMINFO=$withval +else + private_TERMINFO=${TERMINFO-none} +fi + +echo "$ac_t""$private_TERMINFO" 1>&6 +if test $private_TERMINFO != none ; then + cat >> confdefs.h <&6 -echo "configure:3787: checking if you want active-icons" >&5 +echo "configure:3814: 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 @@ -3809,7 +3836,7 @@ fi echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6 -echo "configure:3813: checking if you want ANSI color" >&5 +echo "configure:3840: 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 @@ -3833,7 +3860,7 @@ echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6 -echo "configure:3837: checking if you want 16 colors like aixterm" >&5 +echo "configure:3864: 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 @@ -3857,7 +3884,7 @@ echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6 -echo "configure:3861: checking if you want bold colors mapped like IBM PC" >&5 +echo "configure:3888: 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 @@ -3881,7 +3908,7 @@ echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6 -echo "configure:3885: checking if you want color-mode enabled by default" >&5 +echo "configure:3912: 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 @@ -3905,7 +3932,7 @@ echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6 -echo "configure:3909: checking if you want support for color highlighting" >&5 +echo "configure:3936: 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 @@ -3929,7 +3956,7 @@ echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6 -echo "configure:3933: checking if you want support for doublesize characters" >&5 +echo "configure:3960: 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 @@ -3953,7 +3980,7 @@ echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6 -echo "configure:3957: checking if you want support for input-method" >&5 +echo "configure:3984: 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 @@ -3979,7 +4006,7 @@ fi echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6 -echo "configure:3983: checking if you want support for internationalization" >&5 +echo "configure:4010: checking if you want support for internationalization" >&5 # Check whether --enable-i18n or --disable-i18n was given. if test "${enable_i18n+set}" = set; then @@ -4005,7 +4032,7 @@ fi echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6 -echo "configure:4009: checking if you want support for logging" >&5 +echo "configure:4036: checking if you want support for logging" >&5 # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then @@ -4029,7 +4056,7 @@ EOF echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6 -echo "configure:4033: checking if you want to allow logging via a pipe" >&5 +echo "configure:4060: 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 @@ -4056,7 +4083,7 @@ fi echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6 -echo "configure:4060: checking if you want support for right-scrollbar" >&5 +echo "configure:4087: 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 @@ -4082,7 +4109,7 @@ fi echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6 -echo "configure:4086: checking if you want check for redundant name-change" >&5 +echo "configure:4113: 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 @@ -4106,7 +4133,7 @@ echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6 -echo "configure:4110: checking if you want support for tek4014" >&5 +echo "configure:4137: checking if you want support for tek4014" >&5 # Check whether --enable-tek4014 or --disable-tek4014 was given. if test "${enable_tek4014+set}" = set; then @@ -4136,7 +4163,7 @@ fi echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6 -echo "configure:4140: checking if you want VT52 emulation" >&5 +echo "configure:4167: checking if you want VT52 emulation" >&5 # Check whether --enable-vt52 or --disable-vt52 was given. if test "${enable_vt52+set}" = set; then @@ -4160,7 +4187,7 @@ echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6 -echo "configure:4164: checking if you want -ziconbeep option" >&5 +echo "configure:4191: checking if you want -ziconbeep option" >&5 # Check whether --enable-ziconbeep or --disable-ziconbeep was given. if test "${enable_ziconbeep+set}" = set; then @@ -4185,7 +4212,7 @@ # development/testing aids echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6 -echo "configure:4189: checking if you want debugging traces" >&5 +echo "configure:4216: checking if you want debugging traces" >&5 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then @@ -4214,7 +4241,7 @@ echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:4218: checking if you want to see long compiling messages" >&5 +echo "configure:4245: 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 @@ -4254,7 +4281,7 @@ echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6 -echo "configure:4258: checking if you want magic cookie emulation" >&5 +echo "configure:4285: 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 @@ -4283,7 +4310,7 @@ if test -n "$GCC" ; then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:4287: checking if you want to turn on gcc warnings" >&5 +echo "configure:4314: 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 @@ -4323,9 +4350,9 @@ if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:4327: checking for gcc __attribute__ directives" >&5 +echo "configure:4354: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4394: \"$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 @@ -4380,11 +4407,11 @@ if test -n "$GCC" then cat > conftest.$ac_ext <&6 -echo "configure:4388: checking for gcc warning options" >&5 +echo "configure:4415: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -4402,7 +4429,7 @@ Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4433: \"$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" @@ -4568,6 +4595,8 @@ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g s%@IMAKE@%$IMAKE%g s%@IMAKE_CFLAGS@%$IMAKE_CFLAGS%g +s%@IMAKE_LOADFLAGS@%$IMAKE_LOADFLAGS%g +s%@private_TERMINFO@%$private_TERMINFO%g s%@ECHO_LD@%$ECHO_LD%g s%@RULE_CC@%$RULE_CC%g s%@SHOW_CC@%$SHOW_CC%g Index: configure.in --- xterm-74+/configure.in Tue Apr 28 15:01:01 1998 +++ xterm-75/configure.in Thu May 7 18:09:31 1998 @@ -134,6 +134,21 @@ AC_MSG_RESULT($default_TERM) AC_DEFINE_UNQUOTED(DFT_TERMTYPE,"$default_TERM") +AC_MSG_CHECKING(for private terminfo-directory) +AC_ARG_WITH(own-terminfo, + [ --with-own-terminfo=P set default \$TERMINFO (default: from environment)], + [private_TERMINFO=$withval], + [private_TERMINFO=${TERMINFO-none}]) +AC_MSG_RESULT($private_TERMINFO) +if test $private_TERMINFO != none ; then + AC_DEFINE_UNQUOTED(OWN_TERMINFO_DIR,"$private_TERMINFO") +elif test -d /usr/lib/terminfo ; then + private_TERMINFO=/usr/lib/terminfo +else + private_TERMINFO= +fi +AC_SUBST(private_TERMINFO) + ### checks for optional features AC_MSG_CHECKING(if you want active-icons) CF_ARG_DISABLE(active-icon, Index: main.c --- xterm-74+/main.c Tue Apr 28 15:01:01 1998 +++ xterm-75/main.c Thu May 7 18:09:31 1998 @@ -255,7 +255,7 @@ #define USE_SYSV_TERMIO #define USE_SYSV_SIGNALS #define USE_SYSV_PGRP -#ifndef TIOCSWINSZ +#if defined(__hpux) || !defined(TIOCSWINSZ) #define USE_SYSV_ENVVARS /* COLUMNS/LINES vs. TERMCAP */ #endif /* @@ -283,13 +283,13 @@ #define USE_POSIX_WAIT #define HAS_UTMP_UT_HOST #endif /* SCO */ -#ifdef hpux +#ifdef __hpux #define HAS_BSD_GROUPS #define USE_SYSV_UTMP #define HAS_UTMP_UT_HOST #define USE_POSIX_WAIT #include -#endif /* hpux */ +#endif /* __hpux */ #ifdef __sgi #define HAS_BSD_GROUPS #include @@ -355,9 +355,9 @@ #include #endif -#ifdef hpux +#ifdef __hpux #include -#endif /* hpux */ +#endif /* __hpux */ #if defined(apollo) && OSMAJORVERSION == 10 && OSMINORVERSION < 4 #define ttyslot() 1 @@ -451,7 +451,7 @@ #ifdef SIGTSTP #include -#ifdef hpux +#ifdef __hpux #include #endif #endif @@ -1649,7 +1649,7 @@ unsigned char *old_bufend; old_bufend = (unsigned char *) _bufend(stderr); -#ifdef hpux +#ifdef __hpux stderr->__fileH = (i >> 8); stderr->__fileL = i; #else @@ -1891,6 +1891,16 @@ return(0); #else /* __sgi or umips */ +#ifdef __hpux + /* + * Use the clone device if it works, otherwise use pty_search logic. + */ + if ((*pty = open("/dev/ptym/clone", O_RDWR)) >= 0) { + strcpy(ttydev, ptsname(*pty)); + return(0); + } +#endif + return pty_search(pty); #endif /* __sgi or umips else */ @@ -2910,6 +2920,9 @@ #ifdef UTMP envsize += 2; /* HOME, SHELL */ #endif /* UTMP */ +#ifdef OWN_TERMINFO_DIR + envsize += 1; /* TERMINFO */ +#endif #else /* USE_SYSV_ENVVARS */ envsize += 1; /* TERMCAP */ #endif /* USE_SYSV_ENVVARS */ @@ -3255,7 +3268,10 @@ Setenv("SHELL=", pw->pw_shell); } #endif /* UTMP */ -#else /* USE_SYSV_ENVVAR */ +#ifdef OWN_TERMINFO_DIR + Setenv("TERMINFO=", OWN_TERMINFO_DIR); +#endif +#else /* USE_SYSV_ENVVARS */ if(!TEK4014_ACTIVE(screen) && *newtc) { strcpy (termcap, newtc); resize (screen, termcap, newtc); @@ -3277,7 +3293,7 @@ } if(*newtc) Setenv ("TERMCAP=", newtc); -#endif /* USE_SYSV_ENVVAR */ +#endif /* USE_SYSV_ENVVARS */ /* need to reset after all the ioctl bashing we did above */ @@ -3896,6 +3912,7 @@ updwtmpx(WTMPX_FILE, &utmp); #else #if defined(linux) && __GLIBC__ >= 2 + strncpy (utmp.ut_line, utptr->ut_line, sizeof (utmp.ut_line)); if (term->misc.login_shell) updwtmp(etc_wtmp, &utmp); #else @@ -3948,13 +3965,13 @@ if (!am_slave) { /* restore ownership of tty and pty */ chown (ttydev, 0, 0); -#if (!defined(__sgi) && !defined(__osf__)) +#if (!defined(__sgi) && !defined(__osf__) && !defined(__hpux)) chown (ptydev, 0, 0); #endif /* restore modes of tty and pty */ chmod (ttydev, 0666); -#if (!defined(__sgi) && !defined(__osf__)) +#if (!defined(__sgi) && !defined(__osf__) && !defined(__hpux)) chmod (ptydev, 0666); #endif } Index: print.c --- xterm-74+/print.c Tue Apr 28 15:01:01 1998 +++ xterm-75/print.c Thu May 7 06:33:49 1998 @@ -45,6 +45,12 @@ #include "error.h" #include "xterm.h" +#define SHIFT_IN '\017' +#define SHIFT_OUT '\016' + +#define CSET_IN 'A' +#define CSET_OUT '0' + #define isForm(c) ((c) == '\r' || (c) == '\n' || (c) == '\f') #define Strlen(a) strlen((char *)a) #define Strcmp(a,b) strcmp((char *)a,(char *)b) @@ -60,6 +66,7 @@ static void stringToPrinter PROTO((char * str)); static FILE *Printer; +static int initialized; static void printCursorLine() { @@ -88,6 +95,7 @@ #endif int fg = -1, last_fg = -1; int bg = -1, last_bg = -1; + int cs = CSET_IN,last_cs = CSET_IN; TRACE(("printLine(row=%d, chr=%d)\n", row, chr)) @@ -106,6 +114,7 @@ send_SGR(0,-1,-1); } for (col = 0; col < last; col++) { + Char ch = c[col]; #if OPT_PRINT_COLORS if_OPT_ISO_COLORS(screen,{ if (screen->print_attributes > 1) { @@ -123,19 +132,44 @@ || (last_fg != fg) || (last_bg != bg) #endif ) - && c[col]) { + && ch) { attr = (a[col] & SGR_MASK); last_fg = fg; last_bg = bg; if (screen->print_attributes) send_SGR(attr, fg, bg); } - charToPrinter(c[col] ? c[col] : ' '); + + if (ch == 0) + ch = ' '; + + cs = (ch >= ' ' && ch != 0x7f) ? CSET_IN : CSET_OUT; + if (last_cs != cs) { + if (screen->print_attributes) { + charToPrinter((cs == CSET_OUT) + ? SHIFT_OUT + : SHIFT_IN); + } + last_cs = cs; + } + + /* FIXME: we shouldn't have to map back from the + * alternate character set, except that the + * corresponding charset information is not encoded + * into the CSETS array. + */ + charToPrinter((cs == CSET_OUT) + ? (ch == 0x7f ? 0x5f : (ch + 0x5f)) + : ch); } - if (screen->print_attributes) + if (screen->print_attributes) { send_SGR(0,-1,-1); + if (cs != CSET_IN) + charToPrinter(SHIFT_IN); + } } - charToPrinter('\r'); + if (screen->print_attributes) + charToPrinter('\r'); charToPrinter(chr); } @@ -144,6 +178,7 @@ register TScreen *screen = &term->screen; int top = screen->printer_extent ? 0 : screen->top_marg; int bot = screen->printer_extent ? screen->max_row : screen->bot_marg; + int was_open = initialized; TRACE(("xtermPrintScreen, rows %d..%d\n", top, bot)) @@ -151,6 +186,12 @@ printLine(top++, '\n'); if (screen->printer_formfeed) charToPrinter('\f'); + + if (Printer != 0 && !was_open) { + pclose(Printer); + Printer = 0; + initialized = 0; + } } static void send_CharSet(row) @@ -199,6 +240,12 @@ sprintf(msg + strlen(msg), ";%d", (bg < 8) ? (40 + bg) : (92 + bg)); } if (fg >= 0) { +#if OPT_PC_COLORS + if (term->screen.boldColors + && fg > 8 + && attr & BOLD) + fg -= 8; +#endif sprintf(msg + strlen(msg), ";%d", (fg < 8) ? (30 + fg) : (82 + fg)); } #endif @@ -212,7 +259,6 @@ static void charToPrinter(chr) int chr; { - static int initialized; if (!initialized) { FILE *input; int my_pipe[2]; Index: ptyx.h --- xterm-74+/ptyx.h Tue Apr 28 15:01:01 1998 +++ xterm-75/ptyx.h Wed May 6 19:45:59 1998 @@ -76,49 +76,49 @@ ** allow for mobility of the pty master/slave directories */ #ifndef PTYDEV -#ifdef hpux +#ifdef __hpux #define PTYDEV "/dev/ptym/ptyxx" -#else /* !hpux */ +#else /* !__hpux */ #ifndef __osf__ #define PTYDEV "/dev/ptyxx" #endif -#endif /* !hpux */ +#endif /* !__hpux */ #endif /* !PTYDEV */ #ifndef TTYDEV -#ifdef hpux +#ifdef __hpux #define TTYDEV "/dev/pty/ttyxx" -#else /* !hpux */ +#else /* !__hpux */ #ifdef __osf__ #define TTYDEV "/dev/ttydirs/xxx/xxxxxxxxxxxxxx" #else #define TTYDEV "/dev/ttyxx" #endif -#endif /* !hpux */ +#endif /* !__hpux */ #endif /* !TTYDEV */ #ifndef PTYCHAR1 -#ifdef hpux +#ifdef __hpux #define PTYCHAR1 "zyxwvutsrqp" -#else /* !hpux */ +#else /* !__hpux */ #ifdef __EMX__ #define PTYCHAR1 "pq" #else #define PTYCHAR1 "pqrstuvwxyzPQRSTUVWXYZ" #endif /* !__EMX__ */ -#endif /* !hpux */ +#endif /* !__hpux */ #endif /* !PTYCHAR1 */ #ifndef PTYCHAR2 -#ifdef hpux +#ifdef __hpux #define PTYCHAR2 "fedcba9876543210" -#else /* !hpux */ +#else /* !__hpux */ #ifdef __FreeBSD__ #define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv" #else /* !__FreeBSD__ */ #define PTYCHAR2 "0123456789abcdef" #endif /* !__FreeBSD__ */ -#endif /* !hpux */ +#endif /* !__hpux */ #endif /* !PTYCHAR2 */ #ifndef TTYFORMAT Index: termcap --- xterm-74+/termcap Sat Jun 21 04:30:20 1997 +++ xterm-75/termcap Wed May 6 06:56:04 1998 @@ -38,7 +38,7 @@ :ti=\E7\E[?47h:te=\E[2J\E[?47l\E8:\ :vi=\E[?25l:ve=\E[?25h:\ :up=\E[A:us=\E[4m:ue=\E[24m:xn:\ - :ut:Co#8:op=\E[39m;49m:AB=\E[4%dm:AF=\E[3%dm:\ + :ut:Co#8:op=\E[39m\E49m:AB=\E[4%dm:AF=\E[3%dm:\ :pa#64:Sf=\E[3%dm:Sb=\E[4%dm: v2|xterm-65|xterm with tall window 65x80 (X Window System):\ :li#65:tc=xterm: Index: trace.c --- xterm-74+/trace.c Tue Apr 28 15:01:01 1998 +++ xterm-75/trace.c Wed May 6 18:30:45 1998 @@ -69,15 +69,14 @@ sprintf(name, "Trace-%s.out", trace_who); fp = fopen(name, "w"); if (fp != 0) { + time_t now = time((time_t*)0); #if HAVE_UNISTD_H - time_t now; fprintf(fp, "process %d real (%d/%d) effective (%d/%d) -- %s", getpid(), getuid(), getgid(), geteuid(), getegid(), ctime(&now)); #else - time_t now; fprintf(fp, "process %d -- %s", getpid(), ctime(&now)); Index: version.h --- xterm-74+/version.h Tue Apr 28 15:01:01 1998 +++ xterm-75/version.h Thu May 7 18:09:31 1998 @@ -6,4 +6,4 @@ * version of xterm has been built. The number in parentheses is my patch * number (T.Dickey). */ -#define XTERM_VERSION "XFree86 3.9Ag(74)" +#define XTERM_VERSION "XFree86 3.9Ag(75)" Index: xterm.log.html --- xterm-74+/xterm.log.html Tue Apr 28 15:01:01 1998 +++ xterm-75/xterm.log.html Thu May 7 18:15:05 1998 @@ -41,6 +41,7 @@ xc/programs/Xserver/hw/xfree86). + +

Patch #75 - 1998/5/7 - XFree86 3.9Ah and 3.3.2

+ +This incorporates fixes from several people, as well as some improvements +that I made based on feedback from users: +
    +
  • add option to standalone configure script, "--with-own-terminfo-dir", + which causes xterm to pass a predefined value of $TERMINFO to the + application. Also use this value in install rule "make install-ti", + for the standalone configure script. + + (patch & feedback from Tor Lillqvist <tml@hemuli.tte.vtt.fi>) + +
  • change ifdef's for "hpux" to "__hpux" (patch by Tor Lillqvist). The + imake configuration uses the former, but the latter is predefined by + HP's compilers. + +
  • define USE_SYSV_ENVVARS for HP-UX, curses does not use $TERMCAP (patch + by Tor Lillqvist). + +
  • on HP-UX, use the /dev/ptym/clone device to allocate ptys. Works + both on HP-UX 9 and 10. (patch by Tor Lillqvist). + +
  • modify configure script to obtain the $(EXTRA_LOADFLAGS) value from + imake, needed for compiling under DEC OSF/1 (reported by + Stefan Dalibor) + +
  • modify print-window action so that the printer is closed after + printing a window, unless the printer was already opened (i.e., + by an application running in the window). This makes the printing + complete without having to exit xterm, since not all systems treat + fflush through a pipe very well (reported by Stefan Dalibor) + +
  • modify printing code so that the ^M's are not printed if the + printAttribute resource is set to zero (request by Stefan Dalibor). + +
  • correct typo in xterm.man, for the default value of printAttribute + (reported by Stefan Dalibor). + +
  • correct printing code so that the alternate character set is + printed, like other attributes, with escape sequences. + +
  • correct termcap description, removing spurious 'm' character from + the 'op' capability (reported by Greg Woods <woods@weird.com>). + +
  • correct trace code so that the initial timestamp is set. + +
  • correct/modify utmp data for the Linux glibc 2 configuration, + so that the ut_line member is set before using it to update wtmp + (patch by Bill Nottingham <wen1@cec.wustl.edu>). +

Patch #74 - 1998/4/27 - XFree86 3.9Ag and 3.3.2

Index: xterm.man --- xterm-74+/xterm.man Tue Apr 28 15:01:01 1998 +++ xterm-75/xterm.man Wed May 6 07:10:25 1998 @@ -983,7 +983,7 @@ A ``1'' prints the normal set of attributes (bold, underline, inverse and blink) as VT100-style control sequences. A ``2'' prints ANSI color attributes as well. -The default is ``0.'' +The default is ``1.'' .TP 8 .B "printerControlMode (\fPclass\fB PrinterControlMode)" Specifies the printer control mode. Index: xtermcfg.hin --- xterm-74+/xtermcfg.hin Tue Apr 28 15:01:01 1998 +++ xterm-75/xtermcfg.hin Wed May 6 19:52:55 1998 @@ -49,6 +49,7 @@ #undef HAVE_X11_XPOLL_H /* AC_CHECK_HEADERS(X11/Xpoll.h) */ #undef HAVE_XKBSTDBELL /* AC_CHECK_FUNCS(XkbStdBell) */ #undef NO_ACTIVE_ICON /* CF_ARG_DISABLE(active-icon) */ +#undef OWN_TERMINFO_DIR /* AC_ARG_WITH(own-terminfo) */ #undef OPT_AIX_COLORS /* CF_ARG_DISABLE(16-color) */ #undef OPT_DEC_CHRSET /* CF_ARG_DISABLE(doublechars) */ #undef OPT_HIGHLIGHT_COLOR /* CF_ARG_DISABLE(highlighting) */