# ------------------------------------------------------------------------------
# XTerm.ad | 2
# aclocal.m4 | 49 +++++-
# configure | 434 ++++++++++++++++++++++++++++++-------------------------
# input.c | 114 +++++++++++---
# main.c | 8 -
# os2main.c | 4
# ptyx.h | 2
# terminfo | 175 ++++++++++++++++------
# version.h | 2
# xterm.h | 10 +
# xterm.log.html | 43 +++++
# xtermcfg.hin | 4
# 12 files changed, 577 insertions, 270 deletions
# ------------------------------------------------------------------------------
Index: XTerm.ad
--- xterm-120+/XTerm.ad Sun Jun 13 17:55:49 1999
+++ xterm-121/XTerm.ad Sat Nov 13 08:31:43 1999
@@ -25,7 +25,7 @@
*mainMenu*backarrow key*Label: Backarrow Key
*mainMenu*num-lock*Label: Alt/NumLock Modifiers
*mainMenu*sun function-keys*Label: Sun Function-Keys
-*mainMenu*sun keyboard*Label: Sun/PC Keyboard
+*mainMenu*sun keyboard*Label: VT220 Keyboard
*mainMenu*hp function-keys*Label: HP Function-Keys
*mainMenu*suspend*Label: Send STOP Signal
*mainMenu*continue*Label: Send CONT Signal
Index: aclocal.m4
--- xterm-120+/aclocal.m4 Thu Oct 28 06:50:41 1999
+++ xterm-121/aclocal.m4 Sat Nov 13 17:29:14 1999
@@ -722,14 +722,15 @@
[
AC_REQUIRE([CF_UTMP])
AC_CACHE_CHECK(if $cf_cv_have_utmp is SYSV flavor,cf_cv_sysv_utmp,[
+test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
AC_TRY_LINK([
#include <sys/types.h>
#include <${cf_cv_have_utmp}.h>],[
struct $cf_cv_have_utmp x;
- setutent ();
- getutid(&x);
- pututline(&x);
- endutent();],
+ set${cf_prefix}ent ();
+ get${cf_prefix}id(&x);
+ put${cf_prefix}line(&x);
+ end${cf_prefix}ent();],
[cf_cv_sysv_utmp=yes],
[cf_cv_sysv_utmp=no])
])
@@ -842,6 +843,7 @@
AC_DEFINE(HAVE_UTMP)
test $cf_cv_have_utmp = utmpx && AC_DEFINE(UTMPX_FOR_UTMP)
CF_UTMP_UT_HOST
+ CF_UTMP_UT_XSTATUS
CF_UTMP_UT_XTIME
CF_UTMP_UT_SESSION
CF_SYSV_UTMP
@@ -886,6 +888,43 @@
fi
])
dnl ---------------------------------------------------------------------------
+dnl Check for known variants on the UTMP/UTMPX struct's exit-status as reported
+dnl by various people:
+dnl
+dnl ut_exit.__e_exit (HPUX 11 - David Ellement, also in glibc2)
+dnl ut_exit.e_exit (SVR4)
+dnl ut_exit.ut_e_exit (os390 - Greg Smith)
+dnl ut_exit.ut_exit (Tru64 4.0f - Jeremie Petit, 4.0e - Tomas Vanhala)
+dnl
+dnl Note: utmp_xstatus is not a conventional compatibility definition in the
+dnl system header files.
+AC_DEFUN([CF_UTMP_UT_XSTATUS],
+[
+AC_REQUIRE([CF_UTMP])
+if test $cf_cv_have_utmp != no ; then
+AC_CACHE_CHECK(for exit-status in $cf_cv_have_utmp,cf_cv_have_utmp_ut_xstatus,[
+for cf_result in \
+ ut_exit.__e_exit \
+ ut_exit.e_exit \
+ ut_exit.ut_e_exit \
+ ut_exit.ut_exit
+do
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>],
+ [struct $cf_cv_have_utmp x; long y = x.$cf_result = 0],
+ [cf_cv_have_utmp_ut_xstatus=$cf_result
+ break],
+ [cf_cv_have_utmp_ut_xstatus=no])
+done
+])
+if test $cf_cv_have_utmp_ut_xstatus != no ; then
+ AC_DEFINE(HAVE_UTMP_UT_XSTATUS)
+ AC_DEFINE_UNQUOTED(ut_xstatus,$cf_cv_have_utmp_ut_xstatus)
+fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Check if UTMP/UTMPX struct defines ut_xtime member
AC_DEFUN([CF_UTMP_UT_XTIME],
[
@@ -895,7 +934,7 @@
AC_TRY_COMPILE([
#include <sys/types.h>
#include <${cf_cv_have_utmp}.h>],
- [struct $cf_cv_have_utmp x; long y = x.ut_xtime],
+ [struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0],
[cf_cv_have_utmp_ut_xtime=yes],
[AC_TRY_COMPILE([
#include <sys/types.h>
Index: configure
--- xterm-120+/configure Thu Oct 28 06:54:07 1999
+++ xterm-121/configure Sun Nov 14 18:49:06 1999
@@ -1984,23 +1984,76 @@
if test $cf_cv_have_utmp != no ; then
+echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6
+echo "configure:1989: checking for exit-status in $cf_cv_have_utmp" >&5
+if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+for cf_result in \
+ ut_exit.__e_exit \
+ ut_exit.e_exit \
+ ut_exit.ut_e_exit \
+ ut_exit.ut_exit
+do
+cat > conftest.$ac_ext <<EOF
+#line 2001 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>
+int main() {
+struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
+; return 0; }
+EOF
+if { (eval echo configure:2010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_have_utmp_ut_xstatus=$cf_result
+ break
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_have_utmp_ut_xstatus=no
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$cf_cv_have_utmp_ut_xstatus" 1>&6
+if test $cf_cv_have_utmp_ut_xstatus != no ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_UTMP_UT_XSTATUS 1
+EOF
+
+ cat >> confdefs.h <<EOF
+#define ut_xstatus $cf_cv_have_utmp_ut_xstatus
+EOF
+
+fi
+fi
+
+
+
+if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6
-echo "configure:1989: checking if utmp.ut_xtime is declared" >&5
+echo "configure:2042: checking if utmp.ut_xtime is declared" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1995 "configure"
+#line 2048 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <${cf_cv_have_utmp}.h>
int main() {
-struct $cf_cv_have_utmp x; long y = x.ut_xtime
+struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
; return 0; }
EOF
-if { (eval echo configure:2004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_xtime=yes
else
@@ -2008,7 +2061,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2012 "configure"
+#line 2065 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2017,7 +2070,7 @@
struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
; return 0; }
EOF
-if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_xtime=define
else
@@ -2052,13 +2105,13 @@
if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6
-echo "configure:2056: checking if utmp.ut_session is declared" >&5
+echo "configure:2109: checking if utmp.ut_session is declared" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2062 "configure"
+#line 2115 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2067,7 +2120,7 @@
struct $cf_cv_have_utmp x; long y = x.ut_session
; return 0; }
EOF
-if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_session=yes
else
@@ -2092,13 +2145,14 @@
echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6
-echo "configure:2096: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "configure:2149: checking if $cf_cv_have_utmp is SYSV flavor" >&5
if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
cat > conftest.$ac_ext <<EOF
-#line 2102 "configure"
+#line 2156 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2106,13 +2160,13 @@
int main() {
struct $cf_cv_have_utmp x;
- setutent ();
- getutid(&x);
- pututline(&x);
- endutent();
+ set${cf_prefix}ent ();
+ get${cf_prefix}id(&x);
+ put${cf_prefix}line(&x);
+ end${cf_prefix}ent();
; return 0; }
EOF
-if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_sysv_utmp=yes
else
@@ -2137,14 +2191,14 @@
### checks for structures
echo $ac_n "checking if POSIX VDISABLE symbol should be used""... $ac_c" 1>&6
-echo "configure:2141: checking if POSIX VDISABLE symbol should be used" >&5
+echo "configure:2195: checking if POSIX VDISABLE symbol should be used" >&5
if eval "test \"`echo '$''{'cf_cv_posix_vdisable'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <<EOF
-#line 2148 "configure"
+#line 2202 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -2162,7 +2216,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_posix_vdisable=yes
else
@@ -2174,7 +2228,7 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2178 "configure"
+#line 2232 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -2187,7 +2241,7 @@
int main() { exit(_POSIX_VDISABLE == -1); }
#endif
EOF
-if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_posix_vdisable=yes
else
@@ -2213,13 +2267,13 @@
echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:2217: checking if external errno is declared" >&5
+echo "configure:2271: checking if external errno is declared" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2223 "configure"
+#line 2277 "configure"
#include "confdefs.h"
#if HAVE_STDLIB_H
@@ -2232,7 +2286,7 @@
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:2236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'errno'=yes'
else
@@ -2263,13 +2317,13 @@
# It's possible (for near-UNIX clones) that the data doesn't exist
echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:2267: checking if external errno exists" >&5
+echo "configure:2321: checking if external errno exists" >&5
if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2273 "configure"
+#line 2327 "configure"
#include "confdefs.h"
#undef errno
@@ -2279,7 +2333,7 @@
errno = 2
; return 0; }
EOF
-if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval 'cf_cv_have_'errno'=yes'
else
@@ -2311,7 +2365,7 @@
echo $ac_n "checking for tty group""... $ac_c" 1>&6
-echo "configure:2315: checking for tty group" >&5
+echo "configure:2369: checking for tty group" >&5
if eval "test \"`echo '$''{'cf_cv_tty_group'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2320,7 +2374,7 @@
cf_cv_tty_group=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 2324 "configure"
+#line 2378 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2334,7 +2388,7 @@
}
EOF
-if { (eval echo configure:2338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_tty_group=yes
else
@@ -2359,7 +2413,7 @@
### checks for compiler characteristics
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2363: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2417: 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
@@ -2383,7 +2437,7 @@
do
CFLAGS="$cf_save_CFLAGS $cf_arg"
cat > conftest.$ac_ext <<EOF
-#line 2387 "configure"
+#line 2441 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2399,7 +2453,7 @@
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:2403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2426,12 +2480,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2430: checking for working const" >&5
+echo "configure:2484: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2435 "configure"
+#line 2489 "configure"
#include "confdefs.h"
int main() {
@@ -2480,7 +2534,7 @@
; return 0; }
EOF
-if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2504,12 +2558,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:2508: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2562: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2513 "configure"
+#line 2567 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2525,7 +2579,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2548,13 +2602,13 @@
echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:2552: checking if we must define _GNU_SOURCE" >&5
+echo "configure:2606: checking if we must define _GNU_SOURCE" >&5
if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2558 "configure"
+#line 2612 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2564,7 +2618,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2574,7 +2628,7 @@
cf_save="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
cat > conftest.$ac_ext <<EOF
-#line 2578 "configure"
+#line 2632 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -2584,7 +2638,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -2609,7 +2663,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:2613: checking for X" >&5
+echo "configure:2667: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -2672,12 +2726,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2676 "configure"
+#line 2730 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2746,14 +2800,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2750 "configure"
+#line 2804 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2853,7 +2907,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:2857: checking for open in -lc_s" >&5
+echo "configure:2911: 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
@@ -2861,7 +2915,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2865 "configure"
+#line 2919 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2872,7 +2926,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2889,7 +2943,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:2893: checking for gethostname in -lbsd" >&5
+echo "configure:2947: 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
@@ -2897,7 +2951,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2901 "configure"
+#line 2955 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2908,7 +2962,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2925,7 +2979,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:2929: checking for gethostname in -lnsl_s" >&5
+echo "configure:2983: 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
@@ -2933,7 +2987,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2937 "configure"
+#line 2991 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2944,7 +2998,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2961,7 +3015,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:2965: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:3019: 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
@@ -2969,7 +3023,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2973 "configure"
+#line 3027 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2980,7 +3034,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2997,7 +3051,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:3001: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:3055: 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
@@ -3005,7 +3059,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3009 "configure"
+#line 3063 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3016,7 +3070,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3057,7 +3111,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3061: checking for socket in -lsocket" >&5
+echo "configure:3115: 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
@@ -3065,7 +3119,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3069 "configure"
+#line 3123 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3076,7 +3130,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3104,7 +3158,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3108: checking for gethostname in -lnsl" >&5
+echo "configure:3162: 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
@@ -3112,7 +3166,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3116 "configure"
+#line 3170 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3123,7 +3177,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3174,17 +3228,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:3178: checking whether -R must be followed by a space" >&5
+echo "configure:3232: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3181 "configure"
+#line 3235 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3200,14 +3254,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3204 "configure"
+#line 3258 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3239,7 +3293,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:3243: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3297: 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
@@ -3247,7 +3301,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3251 "configure"
+#line 3305 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3258,7 +3312,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3280,7 +3334,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:3284: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3338: 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
@@ -3288,7 +3342,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3292 "configure"
+#line 3346 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3299,7 +3353,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3328,12 +3382,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:3332: checking for gethostbyname" >&5
+echo "configure:3386: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3337 "configure"
+#line 3391 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3356,7 +3410,7 @@
; return 0; }
EOF
-if { (eval echo configure:3360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -3377,7 +3431,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3381: checking for gethostbyname in -lnsl" >&5
+echo "configure:3435: 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
@@ -3385,7 +3439,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3389 "configure"
+#line 3443 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3396,7 +3450,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3426,12 +3480,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:3430: checking for connect" >&5
+echo "configure:3484: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3435 "configure"
+#line 3489 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3454,7 +3508,7 @@
; return 0; }
EOF
-if { (eval echo configure:3458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -3475,7 +3529,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3479: checking for connect in -lsocket" >&5
+echo "configure:3533: 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
@@ -3483,7 +3537,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3487 "configure"
+#line 3541 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3494,7 +3548,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3518,12 +3572,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:3522: checking for remove" >&5
+echo "configure:3576: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3527 "configure"
+#line 3581 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3546,7 +3600,7 @@
; return 0; }
EOF
-if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -3567,7 +3621,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3571: checking for remove in -lposix" >&5
+echo "configure:3625: 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
@@ -3575,7 +3629,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3579 "configure"
+#line 3633 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3586,7 +3640,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:3590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3610,12 +3664,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3614: checking for shmat" >&5
+echo "configure:3668: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3619 "configure"
+#line 3673 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3638,7 +3692,7 @@
; return 0; }
EOF
-if { (eval echo configure:3642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -3659,7 +3713,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3663: checking for shmat in -lipc" >&5
+echo "configure:3717: 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
@@ -3667,7 +3721,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3671 "configure"
+#line 3725 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3678,7 +3732,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3711,7 +3765,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:3715: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3769: 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
@@ -3719,7 +3773,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3723 "configure"
+#line 3777 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3730,7 +3784,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3757,7 +3811,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3761: checking for XOpenDisplay in -lX11" >&5
+echo "configure:3815: 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
@@ -3765,7 +3819,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3769 "configure"
+#line 3823 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3776,7 +3830,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3797,7 +3851,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3801: checking for XtAppInitialize in -lXt" >&5
+echo "configure:3855: 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
@@ -3805,7 +3859,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3809 "configure"
+#line 3863 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3816,7 +3870,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3872,17 +3926,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3876: checking for $ac_hdr" >&5
+echo "configure:3930: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3881 "configure"
+#line 3935 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3930,7 +3984,7 @@
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:3934: checking for XextCreateExtension in -lXext" >&5
+echo "configure:3988: 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
@@ -3938,7 +3992,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3942 "configure"
+#line 3996 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3949,7 +4003,7 @@
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:3953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3985,13 +4039,13 @@
if test $cf_path != default ; then
CFLAGS="-I$cf_path/include $cf_save"
echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-echo "configure:3989: checking for $cf_test in $cf_path" >&5
+echo "configure:4043: checking for $cf_test in $cf_path" >&5
else
echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:3992: checking for $cf_test" >&5
+echo "configure:4046: checking for $cf_test" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 3995 "configure"
+#line 4049 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -4000,7 +4054,7 @@
; return 0; }
EOF
-if { (eval echo configure:4004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_result=yes
else
@@ -4026,21 +4080,21 @@
if test $cf_path != default ; then
LIBS="-L$cf_path/lib $cf_lib $LIBS"
echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-echo "configure:4030: checking for $cf_lib in $cf_path" >&5
+echo "configure:4084: checking for $cf_lib in $cf_path" >&5
else
LIBS="$cf_lib $LIBS"
echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-echo "configure:4034: checking for $cf_test in $cf_lib" >&5
+echo "configure:4088: checking for $cf_test in $cf_lib" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 4037 "configure"
+#line 4091 "configure"
#include "confdefs.h"
int main() {
$cf_test()
; return 0; }
EOF
-if { (eval echo configure:4044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -4078,13 +4132,13 @@
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:4082: checking for declaration of fd_set" >&5
+echo "configure:4136: checking for declaration of fd_set" >&5
if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "trying sys/types alone" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4088 "configure"
+#line 4142 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4092,7 +4146,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -4101,7 +4155,7 @@
rm -rf conftest*
echo "trying X11/Xpoll.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4105 "configure"
+#line 4159 "configure"
#include "confdefs.h"
#ifdef HAVE_X11_XPOLL_H
@@ -4111,7 +4165,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=X11/Xpoll.h
else
@@ -4120,7 +4174,7 @@
rm -rf conftest*
echo "trying sys/select.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4124 "configure"
+#line 4178 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4129,7 +4183,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -4163,12 +4217,12 @@
for ac_func in grantpt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4167: checking for $ac_func" >&5
+echo "configure:4221: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4172 "configure"
+#line 4226 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4191,7 +4245,7 @@
; return 0; }
EOF
-if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4213,7 +4267,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4217: checking for openpty in -lutil" >&5
+echo "configure:4271: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4221,7 +4275,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4225 "configure"
+#line 4279 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4232,7 +4286,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4266,7 +4320,7 @@
# Extract the first word of "xterm", so it can be a program name with args.
set dummy xterm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4270: checking for $ac_word" >&5
+echo "configure:4324: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XTERM_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4304,12 +4358,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4308: checking for $ac_func" >&5
+echo "configure:4362: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4313 "configure"
+#line 4367 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4332,7 +4386,7 @@
; return 0; }
EOF
-if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4358,7 +4412,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:4362: checking if we should use imake to help" >&5
+echo "configure:4416: 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
@@ -4383,7 +4437,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:4387: checking for $ac_word" >&5
+echo "configure:4441: 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
@@ -4522,7 +4576,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:4526: checking for default terminal-id" >&5
+echo "configure:4580: 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
@@ -4543,7 +4597,7 @@
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:4547: checking for default terminal-type" >&5
+echo "configure:4601: 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
@@ -4560,7 +4614,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:4564: checking for private terminfo-directory" >&5
+echo "configure:4618: 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
@@ -4597,7 +4651,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:4601: checking if you want active-icons" >&5
+echo "configure:4655: 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
@@ -4623,7 +4677,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:4627: checking if you want ANSI color" >&5
+echo "configure:4681: 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
@@ -4649,7 +4703,7 @@
if test $enable_ansi_color = yes ; then
echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6
-echo "configure:4653: checking if you want 16 colors like aixterm" >&5
+echo "configure:4707: 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
@@ -4673,7 +4727,7 @@
echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
-echo "configure:4677: checking if you want 256 colors" >&5
+echo "configure:4731: checking if you want 256 colors" >&5
# Check whether --enable-256-color or --disable-256-color was given.
if test "${enable_256_color+set}" = set; then
@@ -4700,7 +4754,7 @@
else
echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
-echo "configure:4704: checking if you want 88 colors" >&5
+echo "configure:4758: checking if you want 88 colors" >&5
# Check whether --enable-88-color or --disable-88-color was given.
if test "${enable_88_color+set}" = set; then
@@ -4731,7 +4785,7 @@
fi
echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
-echo "configure:4735: checking if you want blinking cursor" >&5
+echo "configure:4789: checking if you want blinking cursor" >&5
# Check whether --enable-blink-cursor or --disable-blink-cursor was given.
if test "${enable_blink_cursor+set}" = set; then
@@ -4757,7 +4811,7 @@
if test $enable_ansi_color = yes ; then
echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6
-echo "configure:4761: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:4815: 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
@@ -4781,7 +4835,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4785: checking if you want color-mode enabled by default" >&5
+echo "configure:4839: 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
@@ -4807,7 +4861,7 @@
fi
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:4811: checking if you want support for color highlighting" >&5
+echo "configure:4865: 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
@@ -4831,7 +4885,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:4835: checking if you want support for doublesize characters" >&5
+echo "configure:4889: 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
@@ -4855,7 +4909,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:4859: checking if you want fallback-support for box characters" >&5
+echo "configure:4913: checking if you want fallback-support for box characters" >&5
# Check whether --enable-boxchars or --disable-boxchars was given.
if test "${enable_boxchars+set}" = set; then
@@ -4879,7 +4933,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:4883: checking if you want support for HP-style function keys" >&5
+echo "configure:4937: checking if you want support for HP-style function keys" >&5
# Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
if test "${enable_hp_fkeys+set}" = set; then
@@ -4905,7 +4959,7 @@
fi
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:4909: checking if you want support for internationalization" >&5
+echo "configure:4963: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -4931,7 +4985,7 @@
fi
echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:4935: checking if you want support for initial-erase setup" >&5
+echo "configure:4989: checking if you want support for initial-erase setup" >&5
# Check whether --enable-initial-erase or --disable-initial-erase was given.
if test "${enable_initial_erase+set}" = set; then
@@ -4957,7 +5011,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:4961: checking if you want support for input-method" >&5
+echo "configure:5015: 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
@@ -4977,13 +5031,13 @@
echo "$ac_t""$enable_ximp" 1>&6
echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
-echo "configure:4981: checking if X libraries support input-method" >&5
+echo "configure:5035: checking if X libraries support input-method" >&5
if eval "test \"`echo '$''{'cf_cv_input_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4987 "configure"
+#line 5041 "configure"
#include "confdefs.h"
#include <X11/IntrinsicP.h>
@@ -5010,7 +5064,7 @@
; return 0; }
EOF
-if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_input_method=yes
else
@@ -5033,7 +5087,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:5037: checking if you want support for logging" >&5
+echo "configure:5091: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -5057,7 +5111,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:5061: checking if you want to allow logging via a pipe" >&5
+echo "configure:5115: 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
@@ -5084,7 +5138,7 @@
fi
echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:5088: checking if you want support for iconify/maximize translations" >&5
+echo "configure:5142: checking if you want support for iconify/maximize translations" >&5
# Check whether --enable-maximize or --disable-maximize was given.
if test "${enable_maximize+set}" = set; then
@@ -5108,7 +5162,7 @@
echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:5112: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:5166: checking if you want NumLock to override keyboard tables" >&5
# Check whether --enable-num-lock or --disable-num-lock was given.
if test "${enable_num_lock+set}" = set; then
@@ -5132,7 +5186,7 @@
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:5136: checking if you want support for right-scrollbar" >&5
+echo "configure:5190: 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
@@ -5158,7 +5212,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:5162: checking if you want check for redundant name-change" >&5
+echo "configure:5216: 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
@@ -5182,7 +5236,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:5186: checking if you want support for tek4014" >&5
+echo "configure:5240: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -5212,7 +5266,7 @@
fi
echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
-echo "configure:5216: checking if you want pulldown menus with a toolbar" >&5
+echo "configure:5270: checking if you want pulldown menus with a toolbar" >&5
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
@@ -5236,7 +5290,7 @@
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:5240: checking if you want VT52 emulation" >&5
+echo "configure:5294: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -5260,7 +5314,7 @@
echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:5264: checking if you want wide-character support" >&5
+echo "configure:5318: checking if you want wide-character support" >&5
# Check whether --enable-wide-chars or --disable-wide-chars was given.
if test "${enable_wide_chars+set}" = set; then
@@ -5289,7 +5343,7 @@
fi
echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
-echo "configure:5293: checking if you want DECterm Locator support" >&5
+echo "configure:5347: checking if you want DECterm Locator support" >&5
# Check whether --enable-dec-locator or --disable-dec-locator was given.
if test "${enable_dec_locator+set}" = set; then
@@ -5315,7 +5369,7 @@
fi
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:5319: checking if you want -ziconbeep option" >&5
+echo "configure:5373: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -5340,7 +5394,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:5344: checking if you want debugging traces" >&5
+echo "configure:5398: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -5369,7 +5423,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:5373: checking if you want to see long compiling messages" >&5
+echo "configure:5427: 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
@@ -5409,7 +5463,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:5413: checking if you want magic cookie emulation" >&5
+echo "configure:5467: 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
@@ -5438,7 +5492,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:5442: checking if you want to turn on gcc warnings" >&5
+echo "configure:5496: 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
@@ -5478,9 +5532,9 @@
if test -n "$GCC"
then
echo "checking for gcc __attribute__ directives" 1>&6
-echo "configure:5482: checking for gcc __attribute__ directives" >&5
+echo "configure:5536: checking for gcc __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 5484 "configure"
+#line 5538 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -5518,7 +5572,7 @@
EOF
;;
esac
- if { (eval echo configure:5522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5576: \"$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
@@ -5535,11 +5589,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 5539 "configure"
+#line 5593 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for gcc warning options" 1>&6
-echo "configure:5543: checking for gcc warning options" >&5
+echo "configure:5597: checking for gcc warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -5557,7 +5611,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:5561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5615: \"$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: input.c
--- xterm-120+/input.c Mon Sep 27 16:12:18 1999
+++ xterm-121/input.c Sun Nov 14 19:25:06 1999
@@ -65,6 +65,8 @@
#endif
#include <X11/Xutil.h>
+#include <X11/StringDefs.h>
+#include <ctype.h>
#include <data.h>
#include <fontutils.h>
@@ -428,6 +430,7 @@
} else {
ModifierParm(5, 1);
}
+ TRACE(("...ModifierParm %d\n", modify_parm));
}
#if OPT_SHIFT_KEYS
@@ -510,7 +513,13 @@
key = TRUE;
} else if (IsFunctionKey(keysym)
|| IsMiscFunctionKey(keysym)
- || IsEditFunctionKey(keysym)) {
+ || IsEditFunctionKey(keysym)
+ || ((keysym == XK_Delete)
+ && ((modify_parm > 1)
+#if OPT_SUNPC_KBD
+ || sunKeyboard
+#endif
+ ))) {
#if OPT_SUNPC_KBD
if (sunKeyboard) {
if ((event->state & ControlMask)
@@ -732,34 +741,34 @@
case XK_F11: return(192);
case XK_F12: return(193);
case XK_F13: return(194);
- case XK_F14: return(195);
+ case XK_F14: return(195); /* kund */
case XK_F15: return(196);
- case XK_Help: return(196);
- case XK_F16: return(197);
+ case XK_Help: return(196); /* khlp */
+ case XK_F16: return(197); /* kcpy */
case XK_Menu: return(197);
case XK_F17: return(198);
case XK_F18: return(199);
- case XK_F19: return(200);
+ case XK_F19: return(200); /* kfnd */
case XK_F20: return(201);
- case XK_R1: return(208);
- case XK_R2: return(209);
- case XK_R3: return(210);
- case XK_R4: return(211);
- case XK_R5: return(212);
- case XK_R6: return(213);
- case XK_R7: return(214);
- case XK_R8: return(215);
- case XK_R9: return(216);
- case XK_R10: return(217);
- case XK_R11: return(218);
- case XK_R12: return(219);
- case XK_R13: return(220);
- case XK_R14: return(221);
- case XK_R15: return(222);
+ case XK_R1: return(208); /* kf31 */
+ case XK_R2: return(209); /* kf32 */
+ case XK_R3: return(210); /* kf33 */
+ case XK_R4: return(211); /* kf34 */
+ case XK_R5: return(212); /* kf35 */
+ case XK_R6: return(213); /* kf36 */
+ case XK_R7: return(214); /* kf37 */
+ case XK_R8: return(215); /* kf38 */
+ case XK_R9: return(216); /* kf39=kpp */
+ case XK_R10: return(217); /* kf40 */
+ case XK_R11: return(218); /* kf41=kb2 */
+ case XK_R12: return(219); /* kf42 */
+ case XK_R13: return(220); /* kf43=kend */
+ case XK_R14: return(221); /* kf44 */
+ case XK_R15: return(222); /* kf45 */
case XK_Find : return(1);
- case XK_Insert: return(2);
+ case XK_Insert: return(2); /* kich1 */
case XK_Delete: return(3);
#ifdef XK_KP_Insert
case XK_KP_Insert: return(2);
@@ -776,8 +785,58 @@
}
#if OPT_NUM_LOCK
+static Bool
+TranslationsUseAlt(Widget w)
+{
+ static String data;
+ static XtResource key_resources[] = {
+ { XtNtranslations, XtCTranslations, XtRString,
+ sizeof(data), 0, XtRString, (XtPointer)NULL}
+ };
+ Bool result = False;
+
+ XtGetSubresources( w, (XtPointer)&data, "vt100", "VT100",
+ key_resources, (Cardinal)1, NULL, (Cardinal)0 );
+
+ if (data != 0) {
+ static const char keyword[] = "alt";
+ char *p = data;
+ int state = 0;
+ int now = ' ', prv;
+ while (*p != 0) {
+ prv = now;
+ now = char2lower(*p++);
+ if (now == ':'
+ || now == '!') {
+ state = -1;
+ } else if (now == '\n') {
+ state = 0;
+ } else if (state >= 0) {
+ if (isgraph(now)
+ && now == keyword[state]) {
+ if ((state != 0
+ || !isalnum(prv))
+ && ((keyword[++state] == 0)
+ && !isalnum(*p))) {
+ result = True;
+ break;
+ }
+ } else {
+ state = 0;
+ }
+ }
+ }
+ }
+ return result;
+}
+
/*
* Determine which modifier mask (if any) applies to the Num_Lock keysym.
+ *
+ * Also, determine which modifiers are associated with the ALT keys, so we can
+ * send that information as a parameter for special keys in Sun/PC keyboard
+ * mode. However, if the ALT modifier is used in translations, we do not want
+ * to confuse things by sending the parameter.
*/
void
VTInitModifiers(void)
@@ -813,6 +872,19 @@
}
k++;
}
+ }
+
+ /*
+ * If the Alt modifier is used in translations, we would rather not
+ * use it to modify function-keys when NumLock is active.
+ */
+ if ((term->misc.alt_left != 0
+ || term->misc.alt_right != 0)
+ && (TranslationsUseAlt(toplevel)
+ || TranslationsUseAlt((Widget)term))) {
+ TRACE(("ALT is used as a modifier in translations (ignore mask)\n"))
+ term->misc.alt_left = 0;
+ term->misc.alt_right = 0;
}
XFreeModifiermap(keymap);
Index: main.c
--- xterm-120+/main.c Thu Oct 28 06:53:26 1999
+++ xterm-121/main.c Sun Nov 14 19:13:02 1999
@@ -894,8 +894,8 @@
{"-hc", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL},
#endif
#if OPT_HP_FUNC_KEYS
-{"-hf", "*hpKeyboard", XrmoptionNoArg, (caddr_t) "on"},
-{"+hf", "*hpKeyboard", XrmoptionNoArg, (caddr_t) "off"},
+{"-hf", "*hpFunctionKeys",XrmoptionNoArg, (caddr_t) "on"},
+{"+hf", "*hpFunctionKeys",XrmoptionNoArg, (caddr_t) "off"},
#endif
{"-hold", "*hold", XrmoptionNoArg, (caddr_t) "on"},
{"+hold", "*hold", XrmoptionNoArg, (caddr_t) "off"},
@@ -3296,8 +3296,8 @@
/* set up the new entry */
utmp.ut_type = USER_PROCESS;
-#if !(defined(linux) && (!defined(__GLIBC__) || (__GLIBC__ < 2))) && !defined(SVR4)
- utmp.ut_exit.e_exit = 2;
+#ifdef HAVE_UTMP_UT_XSTATUS
+ utmp.ut_xstatus = 2;
#endif
(void) strncpy(utmp.ut_user,
(pw && pw->pw_name) ? pw->pw_name : "????",
Index: os2main.c
--- xterm-120+/os2main.c Wed Oct 27 18:57:19 1999
+++ xterm-121/os2main.c Sun Nov 14 19:13:19 1999
@@ -360,8 +360,8 @@
{"-hc", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL},
#endif
#if OPT_HP_FUNC_KEYS
-{"-hf", "*hpKeyboard", XrmoptionNoArg, (caddr_t) "on"},
-{"+hf", "*hpKeyboard", XrmoptionNoArg, (caddr_t) "off"},
+{"-hf", "*hpFunctionKeys",XrmoptionNoArg, (caddr_t) "on"},
+{"+hf", "*hpFunctionKeys",XrmoptionNoArg, (caddr_t) "off"},
#endif
{"-j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "on"},
{"+j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "off"},
Index: ptyx.h
--- xterm-120+/ptyx.h Tue Oct 26 19:35:46 1999
+++ xterm-121/ptyx.h Sat Nov 13 17:15:42 1999
@@ -369,7 +369,7 @@
#endif
#ifndef OPT_I18N_SUPPORT
-#if (XtSpecificationRelease >= 6)
+#if (XtSpecificationRelease >= 5)
#define OPT_I18N_SUPPORT 1 /* true if xterm uses internationalization support */
#else
#define OPT_I18N_SUPPORT 0
Index: terminfo
--- xterm-120+/terminfo Mon Sep 27 16:12:18 1999
+++ xterm-121/terminfo Sun Nov 14 16:28:47 1999
@@ -80,7 +80,92 @@
# Some legacy applications using the termcap emulation may expect kll where
# we have specified kend.
#
+# Function keys with modifiers (Sun/PC):
+# -------------------------------------
+# Shift-Fx - kf{12+x}
+# Control-Fx - kf{24+x}
+# Shift-Control-Fx - kf{36+x}
+#
+# The terminfo defines some special keys which are documented as "shifted",
+# e.g., kDC is shifted-delete-character. In this description, the modifier is
+# actually the control key, to avoid conflict with the common usage of shifted
+# pageup and pagedown for window manager functions.
+#
xterm-xfree86|xterm-new|xterm terminal emulator (XFree86),
+ kDC=\E[3;5~,
+ kEND=\EO5F,
+ kHOM=\EO5H,
+ kIC=\E[2;5~,
+ kLFT=\EO5D,
+ kNXT=\E[6;5~,
+ kPRV=\E[5;5~,
+ kRIT=\EO5C,
+ kb2=\EOE,
+ kbs=^H,
+ kcub1=\EOD,
+ kcud1=\EOB,
+ kcuf1=\EOC,
+ kcuu1=\EOA,
+ kdch1=\177,
+ kend=\EOF,
+ kent=\EOM,
+ kf1=\EOP,
+ kf10=\E[21~,
+ kf11=\E[23~,
+ kf12=\E[24~,
+ kf13=\EO2P,
+ kf14=\EO2Q,
+ kf15=\EO2R,
+ kf16=\EO2S,
+ kf17=\E[15;2~,
+ kf18=\E[17;2~,
+ kf19=\E[18;2~,
+ kf2=\EOQ,
+ kf20=\E[19;2~,
+ kf21=\E[20;2~,
+ kf22=\E[21;2~,
+ kf23=\E[23;2~,
+ kf24=\E[24;2~,
+ kf25=\EO5P,
+ kf26=\EO5Q,
+ kf27=\EO5R,
+ kf28=\EO5S,
+ kf29=\E[15;5~,
+ kf3=\EOR,
+ kf30=\E[17;5~,
+ kf31=\E[18;5~,
+ kf32=\E[19;5~,
+ kf33=\E[20;5~,
+ kf34=\E[21;5~,
+ kf35=\E[23;5~,
+ kf36=\E[24;5~,
+ kf37=\EO6P,
+ kf38=\EO6Q,
+ kf39=\EO6R,
+ kf4=\EOS,
+ kf40=\EO6S,
+ kf41=\E[15;6~,
+ kf42=\E[17;6~,
+ kf43=\E[18;6~,
+ kf44=\E[19;6~,
+ kf45=\E[20;6~,
+ kf46=\E[21;6~,
+ kf47=\E[23;6~,
+ kf48=\E[24;6~,
+ kf5=\E[15~,
+ kf6=\E[17~,
+ kf7=\E[18~,
+ kf8=\E[19~,
+ kf9=\E[20~,
+ khome=\EOH,
+ kich1=\E[2~,
+ kmous=\E[M,
+ knp=\E[6~,
+ kpp=\E[5~,
+ use=xterm-basic,
+#
+# No function keys in this chunk, used for building the keyboard variants.
+xterm-basic|xterm terminal emulator - no function keys (XFree86),
am,
bce,
km,
@@ -133,45 +218,6 @@
ind=^J,
invis=\E[8m,
is2=\E[!p\E[?3;4l\E[4l\E>,
- ka1=\EOH,
- ka3=\E[5~,
- kb2=\EOE,
- kbeg=\EOE,
- kbs=^H,
- kc1=\EOF,
- kc3=\E[6~,
- kcub1=\EOD,
- kcud1=\EOB,
- kcuf1=\EOC,
- kcuu1=\EOA,
- kdch1=\177,
- kend=\EOF,
- kent=\EOM,
- kf1=\EOP,
- kf10=\E[21~,
- kf11=\E[23~,
- kf12=\E[24~,
- kf13=\E[25~,
- kf14=\E[26~,
- kf15=\E[28~,
- kf16=\E[29~,
- kf17=\E[31~,
- kf18=\E[32~,
- kf19=\E[33~,
- kf2=\EOQ,
- kf20=\E[34~,
- kf3=\EOR,
- kf4=\EOS,
- kf5=\E[15~,
- kf6=\E[17~,
- kf7=\E[18~,
- kf8=\E[19~,
- kf9=\E[20~,
- khome=\EOH,
- kich1=\E[2~,
- kmous=\E[M,
- knp=\E[6~,
- kpp=\E[5~,
mc0=\E[i,
mc4=\E[4i,
mc5=\E[5i,
@@ -223,14 +269,43 @@
xterm-vt220|XFree86 xterm emulating vt220,
ka1=\EOw,
ka3=\EOy,
- kb2=\EOu,
kbeg=\EOu,
+ kbs=^H,
kc1=\EOq,
kc3=\EOs,
+ kcub1=\EOD,
+ kcud1=\EOB,
+ kcuf1=\EOC,
+ kcuu1=\EOA,
kdch1=\E[3~,
kend=\E[4~,
+ kent=\EOM,
+ kf1=\EOP,
+ kf10=\E[21~,
+ kf11=\E[23~,
+ kf12=\E[24~,
+ kf13=\E[25~,
+ kf14=\E[26~,
+ kf15=\E[28~,
+ kf16=\E[29~,
+ kf17=\E[31~,
+ kf18=\E[32~,
+ kf19=\E[33~,
+ kf2=\EOQ,
+ kf20=\E[34~,
+ kf3=\EOR,
+ kf4=\EOS,
+ kf5=\E[15~,
+ kf6=\E[17~,
+ kf7=\E[18~,
+ kf8=\E[19~,
+ kf9=\E[20~,
khome=\E[1~,
- use=xterm-xfree86,
+ kich1=\E[2~,
+ kmous=\E[M,
+ knp=\E[6~,
+ kpp=\E[5~,
+ use=xterm-basic,
#
xterm-vt52|XFree86 xterm emulating dec vt52,
cols#80,
@@ -263,8 +338,15 @@
# kf30-kf45 are keysyms XK_R1 through XK_R15 on the Sun keyboard.
xterm-sun|XFree86 xterm with sun function keys,
kb2=\E[218z,
+ kbs=^H,
kcpy=\E[197z,
+ kcub1=\EOD,
+ kcud1=\EOB,
+ kcuf1=\EOC,
+ kcuu1=\EOA,
+ kdch1=\177,
kend=\E[220z,
+ kent=\EOM,
kf1=\E[224z,
kf10=\E[233z,
kf11=\E[192z,
@@ -289,16 +371,20 @@
kf40=\E[217z,
kf42=\E[219z,
kf44=\E[221z,
- kf45=\E[222z,
kf5=\E[228z,
kf6=\E[229z,
kf7=\E[230z,
kf8=\E[231z,
kf9=\E[232z,
+ kfnd=\E[200z,
+ khlp=\E[196z,
khome=\E[214z,
kich1=\E[2z,
+ kmous=\E[M,
+ knp=\E[222z,
kpp=\E[216z,
- use=xterm,
+ kund=\E[195z,
+ use=xterm-basic,
#
xterm-hp|XFree86 xterm with hpterm function keys,
kclr=\EJ,
@@ -466,7 +552,7 @@
ccc,
colors#256,
ncv#32,
- pairs#0,
+ pairs#256,
initc=\E]4;%p1%d;rgb\:%p2%2.2X/%p3%2.2X/%p4%2.2X\E\\,
setab=\E[48;5;%p1%dm,
setaf=\E[38;5;%p1%dm,
@@ -475,6 +561,7 @@
use=xterm-xfree86,
xterm-88color|xterm with 88 colors,
colors#88,
+ pairs#88,
use=xterm-256color,
#
# This is an 8-bit version of xterm, which emulates DEC vt220 with ANSI color.
Index: version.h
--- xterm-120+/version.h Mon Oct 25 20:18:02 1999
+++ xterm-121/version.h Sun Nov 14 16:36:56 1999
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 120
+#define XTERM_PATCH 121
#define XFREE86_VERSION "XFree86 3.9.16c"
Index: xterm.h
--- xterm-120+/xterm.h Thu Oct 28 06:52:45 1999
+++ xterm-121/xterm.h Sat Nov 13 08:04:41 1999
@@ -100,6 +100,10 @@
#define HAVE_UTMP_UT_SESSION 1
#endif
+#if !(defined(linux) && (!defined(__GLIBC__) || (__GLIBC__ < 2))) && !defined(SVR4)
+#define ut_xstatus ut_exit.e_exit
+#endif
+
#if defined(SVR4) || defined(SCO325) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)))
#define HAVE_UTMP_UT_XTIME 1
#endif
@@ -120,8 +124,14 @@
#endif
#if defined(__MVS__)
+#undef ut_xstatus
#define ut_name ut_user
+#define ut_xstatus ut_exit.ut_e_exit
#define ut_xtime ut_tv.tv_sec
+#endif
+
+#if defined(ut_xstatus)
+#define HAVE_UTMP_UT_XSTATUS 1
#endif
#endif /* HAVE_CONFIG_H */
Index: xterm.log.html
--- xterm-120+/xterm.log.html Thu Oct 28 06:55:51 1999
+++ xterm-121/xterm.log.html Sun Nov 14 19:28:44 1999
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_121">Patch #121 - 1999/11/14 - XFree86 3.9.16c</A>
<LI><A HREF="#xterm_120">Patch #120 - 1999/10/28 - XFree86 3.9.16c</A>
<LI><A HREF="#xterm_119">Patch #119 - 1999/10/16 - XFree86 3.9.16c</A>
<LI><A HREF="#xterm_118">Patch #118 - 1999/10/5 - XFree86 3.9.16b</A>
@@ -163,6 +164,48 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_121">Patch #121 - 1999/11/14 - XFree86 3.9.16c</A></H1>
+<ul>
+ <li>change label on "Sun/PC Keyboard" popup menu entry to "VT220
+ Keyboard", since the checked state corresponds to VT220 rather than
+ Sun/PC.
+
+ <li>add configure test CF_UTMP_UT_XSTATUS to handle the variants of
+ utmp exit status (reports by Dave Ellement, Jeremie Petit, Tomas
+ Vanhala).
+
+ <li>amend treatment of ALT key (see patch #94) so that if ALT is used
+ as a modifier in key translations, then no parameter will be sent
+ in escape sequences for Sun/PC function keys (request by Dr Werner Fink).
+
+ <li>modify default for OPT_I18N_SUPPORT to assume that
+ <code>XtSetLanguageProc()</code> is available in X11R5.
+ <p>
+ Caveat: <code>XtSetLanguageProc()</code> was
+ added fairly late in the X11R5 patches, and some vendors shipped
+ buggy versions of this function (request by Tomas Vanhala).
+
+ <li>correct configure macro CF_SYSV_UTMP to test-link with functions
+ consistent with the header, e.g., getutent() for utmp.h and
+ getutxent() for utmpx.h (reported by Greg Smith).
+
+ <li>modify terminfo entry for <code>xterm-xfree86</code> to reflect
+ modifiers for shift and control which (from a patch by Alexander V
+ Lukyanov).
+
+ <li>modify terminfo entry for <code>xterm-sun</code> to match the
+ function-key definitions in ncurses. The pageup/pagedown and
+ related function keys correspond to the Sun keyboard, which does
+ not necessarily correspond with X's notion of those keys.
+
+ <li>modify treatment of XK_Delete keysym so it transmits parameterized
+ VT220-style <code><esc>[3~</code> if modifiers (shift, control
+ alt) are given (request by Alexander V Lukyanov).
+
+ <li>corrected misspelled resource name in command-line option for
+ HP function keys.
+</ul>
<H1><A NAME="xterm_120">Patch #120 - 1999/10/28 - XFree86 3.9.16c</A></H1>
<ul>
Index: xtermcfg.hin
--- xterm-120+/xtermcfg.hin Thu Oct 28 06:53:43 1999
+++ xterm-121/xtermcfg.hin Sat Nov 13 07:54:56 1999
@@ -52,6 +52,7 @@
#undef HAVE_UTMP /* CF_UTMP */
#undef HAVE_UTMP_UT_HOST /* CF_UTMP_UT_HOST */
#undef HAVE_UTMP_UT_SESSION /* CF_UTMP_UT_SESSION */
+#undef HAVE_UTMP_UT_XSTATUS /* CF_UTMP_UT_XSTATUS */
#undef HAVE_UTMP_UT_XTIME /* CF_UTMP_UT_XTIME */
#undef HAVE_WAITPID /* AC_CHECK_FUNCS(waitpid) */
#undef HAVE_X11_DECKEYSYM_H /* AC_CHECK_HEADERS(X11/DECkeysym.h) */
@@ -95,7 +96,8 @@
#undef const /* AC_CONST */
#undef size_t /* AC_TYPE_SIZE_T */
#undef ut_name /* CF_UTMP */
-#undef ut_xtime /* CF_UT_XTIME */
+#undef ut_xstatus /* CF_UTMP_UT_XSTATUS */
+#undef ut_xtime /* CF_UTMP_UT_XTIME */
#undef time_t /* AC_CHECK_TYPE(time_t, long) */
#undef GCC_PRINTF