# ------------------------------------------------------------------------------
# aclocal.m4 | 50 +--
# charproc.c | 13
# configure | 896 ++++++++++---------------------------------------------
# main.c | 6
# version.h | 2
# xterm.log.html | 11
# 6 files changed, 222 insertions, 756 deletions
# ------------------------------------------------------------------------------
Index: aclocal.m4
--- xterm-134+/aclocal.m4 Sun May 28 21:35:01 2000
+++ xterm-135/aclocal.m4 Mon May 29 21:41:38 2000
@@ -700,19 +700,27 @@
dnl Check if this is an SVR4 system. We need the definition for xterm
AC_DEFUN([CF_SVR4],
[
-AC_REQUIRE([AC_FUNC_GETLOADAVG])
+AC_CHECK_LIB(elf, elf_begin,[
AC_CACHE_CHECK(if this is an SVR4 system, cf_cv_svr4,[
AC_TRY_COMPILE([
#include <elf.h>
#include <sys/termio.h>
],[
-#ifndef SVR4
-make an error
-#endif
+static struct termio d_tio;
+ d_tio.c_cc[VINTR] = 0;
+ d_tio.c_cc[VQUIT] = 0;
+ d_tio.c_cc[VERASE] = 0;
+ d_tio.c_cc[VKILL] = 0;
+ d_tio.c_cc[VEOF] = 0;
+ d_tio.c_cc[VEOL] = 0;
+ d_tio.c_cc[VMIN] = 0;
+ d_tio.c_cc[VTIME] = 0;
+ d_tio.c_cc[VLNEXT] = 0;
],
[cf_cv_svr4=yes],
[cf_cv_svr4=no])
])
+])
test "$cf_cv_svr4" = yes && AC_DEFINE(SVR4)
])dnl
dnl ---------------------------------------------------------------------------
@@ -765,6 +773,23 @@
test $cf_cv_sysv_utmp = yes && AC_DEFINE(USE_SYSV_UTMP)
])dnl
dnl ---------------------------------------------------------------------------
+dnl Check for SGI's broken redefinition of baud rates introduced in IRIX 6.5
+dnl (there doesn't appear to be a useful predefined symbol).
+AC_DEFUN([CF_TERMIO_C_ISPEED],
+[
+AC_CACHE_CHECK(for IRIX 6.5 baud-rate redefinitions,cf_cv_termio_c_ispeed,[
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/termio.h>],[
+struct termio foo;
+foo.c_ispeed = B38400;
+foo.c_ospeed = B9600;
+],[cf_cv_termio_c_ispeed=yes
+],[cf_cv_termio_c_ispeed=no])
+])
+test "$cf_cv_termio_c_ispeed" = yes && AC_DEFINE(HAVE_TERMIO_C_ISPEED)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Check if the system has a tty-group defined. This is used in xterm when
dnl setting pty ownership.
AC_DEFUN([CF_TTY_GROUP],
@@ -844,23 +869,6 @@
[cf_cv_tty_group=unknown])
])
test $cf_cv_tty_group = yes && AC_DEFINE(USE_TTY_GROUP)
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl Check for SGI's broken redefinition of baud rates introduced in IRIX 6.5
-dnl (there doesn't appear to be a useful predefined symbol).
-AC_DEFUN([CF_TERMIO_C_ISPEED],
-[
-AC_CACHE_CHECK(for IRIX 6.5 baud-rate redefinitions,cf_cv_termio_c_ispeed,[
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/termio.h>],[
-struct termio foo;
-foo.c_ispeed = B38400;
-foo.c_ospeed = B9600;
-],[cf_cv_termio_c_ispeed=yes
-],[cf_cv_termio_c_ispeed=no])
-])
-test "$cf_cv_termio_c_ispeed" = yes && AC_DEFINE(HAVE_TERMIO_C_ISPEED)
])dnl
dnl ---------------------------------------------------------------------------
dnl Check for the declaration of fd_set. Some platforms declare it in
Index: charproc.c
--- xterm-134+/charproc.c Sun May 28 16:23:07 2000
+++ xterm-135/charproc.c Mon May 29 11:57:49 2000
@@ -702,19 +702,6 @@
bg = COLOR_RV;
}
- /* This implements the IBM PC-style convention of 8-colors, with one
- * bit for bold, thus mapping the 0-7 codes to 8-15. It won't make
- * much sense for 16-color applications, but we keep it to retain
- * compatiblity with ANSI-color applications.
- */
-#if OPT_PC_COLORS /* XXXJTL should be settable at runtime (resource or OSC?) */
- if (term->screen.boldColors
- && (bg >= 0)
- && (bg < 8)
- && (term->flags & BOLD))
- bg |= 8;
-#endif
-
SGR_Background(bg);
}
Index: configure
--- xterm-134+/configure Sun May 28 21:35:04 2000
+++ xterm-135/configure Mon May 29 21:42:09 2000
@@ -2790,13 +2790,9 @@
EOF
-ac_have_func=no # yes means we've found a way to get the load average.
-# Some systems with -lutil have (and need) -lkvm as well, some do not.
-# On Solaris, -lkvm requires nlist from -lelf, so check that first
-# to get the right answer into the cache.
echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6
-echo "configure:2800: checking for elf_begin in -lelf" >&5
+echo "configure:2796: checking for elf_begin in -lelf" >&5
ac_lib_var=`echo elf'_'elf_begin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2804,7 +2800,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lelf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2808 "configure"
+#line 2804 "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
@@ -2815,7 +2811,7 @@
elf_begin()
; return 0; }
EOF
-if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2815: \"$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
@@ -2830,564 +2826,15 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- LIBS="-lelf $LIBS"
-else
- echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking for kvm_open in -lkvm""... $ac_c" 1>&6
-echo "configure:2840: checking for kvm_open in -lkvm" >&5
-ac_lib_var=`echo kvm'_'kvm_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
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lkvm $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2848 "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
- builtin and then its argument prototype would still apply. */
-char kvm_open();
-
-int main() {
-kvm_open()
-; return 0; }
-EOF
-if { (eval echo configure:2859: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBS="-lkvm $LIBS"
-else
- echo "$ac_t""no" 1>&6
-fi
-
-# Check for the 4.4BSD definition of getloadavg.
-echo $ac_n "checking for getloadavg in -lutil""... $ac_c" 1>&6
-echo "configure:2881: checking for getloadavg in -lutil" >&5
-ac_lib_var=`echo util'_'getloadavg | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lutil $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2889 "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
- builtin and then its argument prototype would still apply. */
-char getloadavg();
-
-int main() {
-getloadavg()
-; return 0; }
-EOF
-if { (eval echo configure:2900: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-if test $ac_have_func = no; then
- # There is a commonly available library for RS/6000 AIX.
- # Since it is not a standard part of AIX, it might be installed locally.
- ac_getloadavg_LIBS="$LIBS"; LIBS="-L/usr/local/lib $LIBS"
- echo $ac_n "checking for getloadavg in -lgetloadavg""... $ac_c" 1>&6
-echo "configure:2926: checking for getloadavg in -lgetloadavg" >&5
-ac_lib_var=`echo getloadavg'_'getloadavg | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lgetloadavg $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2934 "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
- builtin and then its argument prototype would still apply. */
-char getloadavg();
-
-int main() {
-getloadavg()
-; return 0; }
-EOF
-if { (eval echo configure:2945: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBS="-lgetloadavg $LIBS"
-else
- echo "$ac_t""no" 1>&6
-LIBS="$ac_getloadavg_LIBS"
-fi
-
-fi
-
-# Make sure it is really in the library, if we think we found it.
-for ac_func in getloadavg
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2972: 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 2977 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3000: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-fi
-done
-
-
-
-if test $ac_cv_func_getloadavg = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_GETLOADAVG 1
-EOF
-
- ac_have_func=yes
-else
- # Figure out what our getloadavg.c needs.
- ac_have_func=no
- ac_safe=`echo "sys/dg_sys_info.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/dg_sys_info.h""... $ac_c" 1>&6
-echo "configure:3038: checking for sys/dg_sys_info.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3043 "configure"
-#include "confdefs.h"
-#include <sys/dg_sys_info.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3048: \"$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*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_have_func=yes; cat >> confdefs.h <<\EOF
-#define DGUX 1
-EOF
-
- echo $ac_n "checking for dg_sys_info in -ldgc""... $ac_c" 1>&6
-echo "configure:3069: checking for dg_sys_info in -ldgc" >&5
-ac_lib_var=`echo dgc'_'dg_sys_info | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ldgc $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3077 "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
- builtin and then its argument prototype would still apply. */
-char dg_sys_info();
-
-int main() {
-dg_sys_info()
-; return 0; }
-EOF
-if { (eval echo configure:3088: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo dgc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
- LIBS="-ldgc $LIBS"
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
- # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
- # uses stabs), but it is still SVR4. We cannot check for <elf.h> because
- # Irix 4.0.5F has the header but not the library.
- if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then
- ac_have_func=yes; cat >> confdefs.h <<\EOF
-#define SVR4 1
-EOF
-
- fi
-
- if test $ac_have_func = no; then
- ac_safe=`echo "inq_stats/cpustats.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for inq_stats/cpustats.h""... $ac_c" 1>&6
-echo "configure:3133: checking for inq_stats/cpustats.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3138 "configure"
-#include "confdefs.h"
-#include <inq_stats/cpustats.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3143: \"$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*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_have_func=yes; cat >> confdefs.h <<\EOF
-#define UMAX 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define UMAX4_3 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
-
- if test $ac_have_func = no; then
- ac_safe=`echo "sys/cpustats.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/cpustats.h""... $ac_c" 1>&6
-echo "configure:3176: checking for sys/cpustats.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3181 "configure"
-#include "confdefs.h"
-#include <sys/cpustats.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3186: \"$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*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_have_func=yes; cat >> confdefs.h <<\EOF
-#define UMAX 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
-
- if test $ac_have_func = no; then
- for ac_hdr in mach/mach.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3217: 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 3222 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3227: \"$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*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
- fi
-
- ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:3257: checking for nlist.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3262 "configure"
-#include "confdefs.h"
-#include <nlist.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3267: \"$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*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define NLIST_STRUCT 1
-EOF
-
- echo $ac_n "checking for n_un in struct nlist""... $ac_c" 1>&6
-echo "configure:3288: checking for n_un in struct nlist" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_nlist_n_un'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3293 "configure"
-#include "confdefs.h"
-#include <nlist.h>
-int main() {
-struct nlist n; n.n_un.n_name = 0;
-; return 0; }
-EOF
-if { (eval echo configure:3300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_nlist_n_un=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_struct_nlist_n_un=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_struct_nlist_n_un" 1>&6
- if test $ac_cv_struct_nlist_n_un = yes; then
- cat >> confdefs.h <<\EOF
-#define NLIST_NAME_UNION 1
-EOF
-
- fi
-else
- echo "$ac_t""no" 1>&6
-fi
-fi # Do not have getloadavg in system libraries.
-
-# Some definitions of getloadavg require that the program be installed setgid.
-echo $ac_n "checking whether getloadavg requires setgid""... $ac_c" 1>&6
-echo "configure:3327: checking whether getloadavg requires setgid" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getloadavg_setgid'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3332 "configure"
-#include "confdefs.h"
-#include "$srcdir/getloadavg.c"
-#ifdef LDAV_PRIVILEGED
-Yowza Am I SETGID yet
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "Yowza Am I SETGID yet" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_func_getloadavg_setgid=yes
-else
- rm -rf conftest*
- ac_cv_func_getloadavg_setgid=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_func_getloadavg_setgid" 1>&6
-if test $ac_cv_func_getloadavg_setgid = yes; then
- NEED_SETGID=true; cat >> confdefs.h <<\EOF
-#define GETLOADAVG_PRIVILEGED 1
-EOF
-
-else
- NEED_SETGID=false
-fi
-
-if test $ac_cv_func_getloadavg_setgid = yes; then
- echo $ac_n "checking group of /dev/kmem""... $ac_c" 1>&6
-echo "configure:3363: checking group of /dev/kmem" >&5
-if eval "test \"`echo '$''{'ac_cv_group_kmem'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # On Solaris, /dev/kmem is a symlink. Get info on the real file.
- ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null`
- # If we got an error (system does not support symlinks), try without -L.
- test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem`
- ac_cv_group_kmem=`echo $ac_ls_output \
- | sed -ne 's/[ ][ ]*/ /g;
- s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\) *.*/\1/;
- / /s/.* //;p;'`
-
-fi
-
-echo "$ac_t""$ac_cv_group_kmem" 1>&6
- KMEM_GROUP=$ac_cv_group_kmem
-fi
-
-
-
echo $ac_n "checking if this is an SVR4 system""... $ac_c" 1>&6
-echo "configure:3385: checking if this is an SVR4 system" >&5
+echo "configure:2832: checking if this is an SVR4 system" >&5
if eval "test \"`echo '$''{'cf_cv_svr4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3391 "configure"
+#line 2838 "configure"
#include "confdefs.h"
#include <elf.h>
@@ -3395,13 +2842,20 @@
int main() {
-#ifndef SVR4
-make an error
-#endif
+static struct termio d_tio;
+ d_tio.c_cc[VINTR] = 0;
+ d_tio.c_cc[VQUIT] = 0;
+ d_tio.c_cc[VERASE] = 0;
+ d_tio.c_cc[VKILL] = 0;
+ d_tio.c_cc[VEOF] = 0;
+ d_tio.c_cc[VEOL] = 0;
+ d_tio.c_cc[VMIN] = 0;
+ d_tio.c_cc[VTIME] = 0;
+ d_tio.c_cc[VLNEXT] = 0;
; return 0; }
EOF
-if { (eval echo configure:3405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_svr4=yes
else
@@ -3415,6 +2869,11 @@
fi
echo "$ac_t""$cf_cv_svr4" 1>&6
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
test "$cf_cv_svr4" = yes && cat >> confdefs.h <<\EOF
#define SVR4 1
EOF
@@ -3422,13 +2881,13 @@
echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:3426: checking if we must define _GNU_SOURCE" >&5
+echo "configure:2885: 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 3432 "configure"
+#line 2891 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -3438,7 +2897,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:3442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -3448,7 +2907,7 @@
cf_save="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
cat > conftest.$ac_ext <<EOF
-#line 3452 "configure"
+#line 2911 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -3458,7 +2917,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:3462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -3483,7 +2942,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:3487: checking for X" >&5
+echo "configure:2946: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -3546,12 +3005,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 3550 "configure"
+#line 3009 "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:3555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3014: \"$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*
@@ -3620,14 +3079,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3624 "configure"
+#line 3083 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3090: \"$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.
@@ -3727,7 +3186,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:3731: checking for open in -lc_s" >&5
+echo "configure:3190: 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
@@ -3735,7 +3194,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3739 "configure"
+#line 3198 "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
@@ -3746,7 +3205,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3209: \"$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
@@ -3763,7 +3222,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:3767: checking for gethostname in -lbsd" >&5
+echo "configure:3226: 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
@@ -3771,7 +3230,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3775 "configure"
+#line 3234 "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
@@ -3782,7 +3241,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3245: \"$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
@@ -3799,7 +3258,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:3803: checking for gethostname in -lnsl_s" >&5
+echo "configure:3262: 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
@@ -3807,7 +3266,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3811 "configure"
+#line 3270 "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
@@ -3818,7 +3277,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3281: \"$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
@@ -3835,7 +3294,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:3839: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:3298: 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
@@ -3843,7 +3302,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3847 "configure"
+#line 3306 "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
@@ -3854,7 +3313,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3317: \"$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
@@ -3871,7 +3330,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:3875: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:3334: 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
@@ -3879,7 +3338,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3883 "configure"
+#line 3342 "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
@@ -3890,7 +3349,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3353: \"$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
@@ -3931,7 +3390,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3935: checking for socket in -lsocket" >&5
+echo "configure:3394: 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
@@ -3939,7 +3398,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3943 "configure"
+#line 3402 "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
@@ -3950,7 +3409,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3413: \"$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
@@ -3978,7 +3437,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3982: checking for gethostname in -lnsl" >&5
+echo "configure:3441: 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
@@ -3986,7 +3445,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3990 "configure"
+#line 3449 "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
@@ -3997,7 +3456,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:4001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3460: \"$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
@@ -4048,17 +3507,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:4052: checking whether -R must be followed by a space" >&5
+echo "configure:3511: 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 4055 "configure"
+#line 3514 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -4074,14 +3533,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 4078 "configure"
+#line 3537 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -4113,7 +3572,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:4117: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3576: 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
@@ -4121,7 +3580,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4125 "configure"
+#line 3584 "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
@@ -4132,7 +3591,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3595: \"$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
@@ -4154,7 +3613,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:4158: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3617: 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
@@ -4162,7 +3621,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4166 "configure"
+#line 3625 "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
@@ -4173,7 +3632,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3636: \"$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
@@ -4202,12 +3661,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:4206: checking for gethostbyname" >&5
+echo "configure:3665: 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 4211 "configure"
+#line 3670 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -4230,7 +3689,7 @@
; return 0; }
EOF
-if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3693: \"$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
@@ -4251,7 +3710,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4255: checking for gethostbyname in -lnsl" >&5
+echo "configure:3714: 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
@@ -4259,7 +3718,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4263 "configure"
+#line 3722 "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
@@ -4270,7 +3729,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3733: \"$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
@@ -4300,12 +3759,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:4304: checking for connect" >&5
+echo "configure:3763: 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 4309 "configure"
+#line 3768 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -4328,7 +3787,7 @@
; return 0; }
EOF
-if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3791: \"$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
@@ -4349,7 +3808,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4353: checking for connect in -lsocket" >&5
+echo "configure:3812: 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
@@ -4357,7 +3816,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4361 "configure"
+#line 3820 "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
@@ -4368,7 +3827,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3831: \"$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
@@ -4392,12 +3851,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:4396: checking for remove" >&5
+echo "configure:3855: 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 4401 "configure"
+#line 3860 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -4420,7 +3879,7 @@
; return 0; }
EOF
-if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3883: \"$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
@@ -4441,7 +3900,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4445: checking for remove in -lposix" >&5
+echo "configure:3904: 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
@@ -4449,7 +3908,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4453 "configure"
+#line 3912 "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
@@ -4460,7 +3919,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:4464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3923: \"$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
@@ -4484,12 +3943,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4488: checking for shmat" >&5
+echo "configure:3947: 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 4493 "configure"
+#line 3952 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -4512,7 +3971,7 @@
; return 0; }
EOF
-if { (eval echo configure:4516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3975: \"$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
@@ -4533,7 +3992,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4537: checking for shmat in -lipc" >&5
+echo "configure:3996: 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
@@ -4541,7 +4000,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4545 "configure"
+#line 4004 "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
@@ -4552,7 +4011,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4015: \"$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
@@ -4585,7 +4044,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:4589: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4048: 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
@@ -4593,7 +4052,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4597 "configure"
+#line 4056 "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
@@ -4604,7 +4063,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:4608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4067: \"$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
@@ -4631,7 +4090,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:4635: checking for XOpenDisplay in -lX11" >&5
+echo "configure:4094: 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
@@ -4639,7 +4098,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4643 "configure"
+#line 4102 "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
@@ -4650,7 +4109,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4113: \"$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
@@ -4671,7 +4130,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:4675: checking for XtAppInitialize in -lXt" >&5
+echo "configure:4134: 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
@@ -4679,7 +4138,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4683 "configure"
+#line 4142 "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
@@ -4690,7 +4149,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4153: \"$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
@@ -4747,17 +4206,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4751: checking for $ac_hdr" >&5
+echo "configure:4210: 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 4756 "configure"
+#line 4215 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4220: \"$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*
@@ -4805,7 +4264,7 @@
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4809: checking for XextCreateExtension in -lXext" >&5
+echo "configure:4268: 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
@@ -4813,7 +4272,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4817 "configure"
+#line 4276 "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
@@ -4824,7 +4283,7 @@
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4287: \"$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
@@ -4860,13 +4319,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:4864: checking for $cf_test in $cf_path" >&5
+echo "configure:4323: checking for $cf_test in $cf_path" >&5
else
echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:4867: checking for $cf_test" >&5
+echo "configure:4326: checking for $cf_test" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 4870 "configure"
+#line 4329 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -4875,7 +4334,7 @@
; return 0; }
EOF
-if { (eval echo configure:4879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_result=yes
else
@@ -4901,21 +4360,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:4905: checking for $cf_lib in $cf_path" >&5
+echo "configure:4364: 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:4909: checking for $cf_test in $cf_lib" >&5
+echo "configure:4368: checking for $cf_test in $cf_lib" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 4912 "configure"
+#line 4371 "configure"
#include "confdefs.h"
int main() {
$cf_test()
; return 0; }
EOF
-if { (eval echo configure:4919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -4953,13 +4412,13 @@
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:4957: checking for declaration of fd_set" >&5
+echo "configure:4416: 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 4963 "configure"
+#line 4422 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4967,7 +4426,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -4976,7 +4435,7 @@
rm -rf conftest*
echo "trying X11/Xpoll.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4980 "configure"
+#line 4439 "configure"
#include "confdefs.h"
#ifdef HAVE_X11_XPOLL_H
@@ -4986,7 +4445,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=X11/Xpoll.h
else
@@ -4995,7 +4454,7 @@
rm -rf conftest*
echo "trying sys/select.h" 1>&5
cat > conftest.$ac_ext <<EOF
-#line 4999 "configure"
+#line 4458 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5004,7 +4463,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:5008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -5030,13 +4489,13 @@
echo $ac_n "checking for IRIX 6.5 baud-rate redefinitions""... $ac_c" 1>&6
-echo "configure:5034: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "configure:4493: checking for IRIX 6.5 baud-rate redefinitions" >&5
if eval "test \"`echo '$''{'cf_cv_termio_c_ispeed'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5040 "configure"
+#line 4499 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5049,7 +4508,7 @@
; return 0; }
EOF
-if { (eval echo configure:5053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_termio_c_ispeed=yes
@@ -5079,12 +4538,12 @@
for ac_func in grantpt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5083: checking for $ac_func" >&5
+echo "configure:4542: 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 5088 "configure"
+#line 4547 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5107,7 +4566,7 @@
; return 0; }
EOF
-if { (eval echo configure:5111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4570: \"$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
@@ -5129,7 +4588,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:5133: checking for openpty in -lutil" >&5
+echo "configure:4592: 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
@@ -5137,7 +4596,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5141 "configure"
+#line 4600 "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
@@ -5148,7 +4607,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4611: \"$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
@@ -5182,7 +4641,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:5186: checking for $ac_word" >&5
+echo "configure:4645: 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
@@ -5220,12 +4679,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5224: checking for $ac_func" >&5
+echo "configure:4683: 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 5229 "configure"
+#line 4688 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5248,7 +4707,7 @@
; return 0; }
EOF
-if { (eval echo configure:5252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4711: \"$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
@@ -5274,7 +4733,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:5278: checking if we should use imake to help" >&5
+echo "configure:4737: 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
@@ -5299,7 +4758,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:5303: checking for $ac_word" >&5
+echo "configure:4762: 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
@@ -5438,7 +4897,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:5442: checking for default terminal-id" >&5
+echo "configure:4901: 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
@@ -5459,7 +4918,7 @@
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:5463: checking for default terminal-type" >&5
+echo "configure:4922: 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
@@ -5476,7 +4935,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:5480: checking for private terminfo-directory" >&5
+echo "configure:4939: 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
@@ -5515,7 +4974,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:5519: checking if you want active-icons" >&5
+echo "configure:4978: 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
@@ -5541,7 +5000,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:5545: checking if you want ANSI color" >&5
+echo "configure:5004: 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
@@ -5567,7 +5026,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:5571: checking if you want 16 colors like aixterm" >&5
+echo "configure:5030: 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
@@ -5591,7 +5050,7 @@
echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
-echo "configure:5595: checking if you want 256 colors" >&5
+echo "configure:5054: 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
@@ -5618,7 +5077,7 @@
else
echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
-echo "configure:5622: checking if you want 88 colors" >&5
+echo "configure:5081: 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
@@ -5649,7 +5108,7 @@
fi
echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
-echo "configure:5653: checking if you want blinking cursor" >&5
+echo "configure:5112: 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
@@ -5675,7 +5134,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:5679: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:5138: 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
@@ -5699,7 +5158,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:5703: checking if you want color-mode enabled by default" >&5
+echo "configure:5162: 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
@@ -5725,7 +5184,7 @@
fi
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:5729: checking if you want support for color highlighting" >&5
+echo "configure:5188: 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
@@ -5749,7 +5208,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:5753: checking if you want support for doublesize characters" >&5
+echo "configure:5212: 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
@@ -5773,7 +5232,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:5777: checking if you want fallback-support for box characters" >&5
+echo "configure:5236: 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
@@ -5797,7 +5256,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:5801: checking if you want support for HP-style function keys" >&5
+echo "configure:5260: 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
@@ -5823,7 +5282,7 @@
fi
echo $ac_n "checking if you want support for SCO-style function keys""... $ac_c" 1>&6
-echo "configure:5827: checking if you want support for SCO-style function keys" >&5
+echo "configure:5286: checking if you want support for SCO-style function keys" >&5
# Check whether --enable-sco-fkeys or --disable-sco-fkeys was given.
if test "${enable_sco_fkeys+set}" = set; then
@@ -5849,7 +5308,7 @@
fi
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:5853: checking if you want support for internationalization" >&5
+echo "configure:5312: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -5875,7 +5334,7 @@
fi
echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:5879: checking if you want support for initial-erase setup" >&5
+echo "configure:5338: 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
@@ -5901,7 +5360,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:5905: checking if you want support for input-method" >&5
+echo "configure:5364: 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
@@ -5921,13 +5380,13 @@
echo "$ac_t""$enable_ximp" 1>&6
echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
-echo "configure:5925: checking if X libraries support input-method" >&5
+echo "configure:5384: 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 5931 "configure"
+#line 5390 "configure"
#include "confdefs.h"
#include <X11/IntrinsicP.h>
@@ -5954,7 +5413,7 @@
; return 0; }
EOF
-if { (eval echo configure:5958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_input_method=yes
else
@@ -5977,7 +5436,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:5981: checking if you want support for logging" >&5
+echo "configure:5440: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -6001,7 +5460,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:6005: checking if you want to allow logging via a pipe" >&5
+echo "configure:5464: 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
@@ -6028,7 +5487,7 @@
fi
echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:6032: checking if you want support for iconify/maximize translations" >&5
+echo "configure:5491: 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
@@ -6052,7 +5511,7 @@
echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:6056: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:5515: 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
@@ -6076,7 +5535,7 @@
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:6080: checking if you want support for right-scrollbar" >&5
+echo "configure:5539: 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
@@ -6102,7 +5561,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:6106: checking if you want check for redundant name-change" >&5
+echo "configure:5565: 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
@@ -6126,7 +5585,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:6130: checking if you want support for tek4014" >&5
+echo "configure:5589: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -6156,7 +5615,7 @@
fi
echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
-echo "configure:6160: checking if you want pulldown menus with a toolbar" >&5
+echo "configure:5619: 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
@@ -6180,7 +5639,7 @@
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:6184: checking if you want VT52 emulation" >&5
+echo "configure:5643: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -6204,7 +5663,7 @@
echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:6208: checking if you want wide-character support" >&5
+echo "configure:5667: 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
@@ -6233,7 +5692,7 @@
fi
echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
-echo "configure:6237: checking if you want DECterm Locator support" >&5
+echo "configure:5696: 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
@@ -6259,7 +5718,7 @@
fi
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:6263: checking if you want -ziconbeep option" >&5
+echo "configure:5722: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -6284,7 +5743,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:6288: checking if you want debugging traces" >&5
+echo "configure:5747: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -6313,7 +5772,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:6317: checking if you want to see long compiling messages" >&5
+echo "configure:5776: 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
@@ -6353,7 +5812,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:6357: checking if you want magic cookie emulation" >&5
+echo "configure:5816: 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
@@ -6382,7 +5841,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:6386: checking if you want to turn on gcc warnings" >&5
+echo "configure:5845: 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
@@ -6422,9 +5881,9 @@
if test -n "$GCC"
then
echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:6426: checking for $CC __attribute__ directives" >&5
+echo "configure:5885: checking for $CC __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 6428 "configure"
+#line 5887 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -6462,7 +5921,7 @@
EOF
;;
esac
- if { (eval echo configure:6466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5925: \"$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
@@ -6479,11 +5938,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 6483 "configure"
+#line 5942 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for $CC warning options" 1>&6
-echo "configure:6487: checking for $CC warning options" >&5
+echo "configure:5946: checking for $CC warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -6501,7 +5960,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:6505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5964: \"$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"
@@ -6674,9 +6133,6 @@
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@LIBOBJS@%$LIBOBJS%g
-s%@NEED_SETGID@%$NEED_SETGID%g
-s%@KMEM_GROUP@%$KMEM_GROUP%g
s%@X_CFLAGS@%$X_CFLAGS%g
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
s%@X_LIBS@%$X_LIBS%g
Index: main.c
--- xterm-134+/main.c Sun May 28 19:48:16 2000
+++ xterm-135/main.c Mon May 29 12:44:48 2000
@@ -3604,8 +3604,12 @@
}
#if OPT_INITIAL_ERASE
if (*newtc) {
+ unsigned len;
remove_termcap_entry (newtc, TERMCAP_ERASE "=");
- sprintf(newtc + strlen(newtc), ":%s=\\%03o", TERMCAP_ERASE, initial_erase & 0377);
+ len = strlen(newtc);
+ if (len != 0 && newtc[len-1] == ':')
+ len--;
+ sprintf(newtc + len, ":%s=\\%03o:", TERMCAP_ERASE, initial_erase & 0377);
}
#endif
if(*newtc)
Index: version.h
--- xterm-134+/version.h Sun May 28 17:39:34 2000
+++ xterm-135/version.h Mon May 29 12:21:59 2000
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 134
+#define XTERM_PATCH 135
#define XFREE86_VERSION "XFree86 4.0b"
Index: xterm.log.html
--- xterm-134+/xterm.log.html Sun May 28 20:50:02 2000
+++ xterm-135/xterm.log.html Mon May 29 21:48:57 2000
@@ -42,6 +42,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_135">Patch #135 - 2000/5/29 - XFree86 4.0b</A>
<LI><A HREF="#xterm_134">Patch #134 - 2000/5/28 - XFree86 4.0b</A>
<LI><A HREF="#xterm_133">Patch #133 - 2000/5/2 - XFree86 4.0a</A>
<LI><A HREF="#xterm_132">Patch #132 - 2000/4/11 - XFree86 4.0a</A>
@@ -178,6 +179,16 @@
<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_135">Patch #135 - 2000/5/29 - XFree86 4.0b</A></H1>
+<ul>
+ <li>remove code introduced in #134 which made some backgrounds bold.
+
+ <li>minor correction to format of updated $TERMCAP when adding
+ <code>kb</code> capability for <code>ptyInitialErase</code> logic.
+
+ <li>improved test for SVR4 definition.
+</ul>
<H1><A NAME="xterm_134">Patch #134 - 2000/5/28 - XFree86 4.0b</A></H1>
<ul>