# ------------------------------------------------------------------------------
# Makefile.in | 9
# aclocal.m4 | 113 ++-----
# configure | 694 +++++++++++++++++++++++-------------------------
# configure.in | 5
# ctlseqs.ms | 92 +++---
# data.h | 2
# main.c | 3
# misc.c | 7
# resize.c | 14
# version.h | 2
# xterm-118/sinstall.sh | 93 ++++++
# xterm.log.html | 29 ++
# xtermcfg.hin | 1
# 13 files changed, 573 insertions, 491 deletions
# ------------------------------------------------------------------------------
Index: Makefile.in
--- xterm-117+/Makefile.in Mon Sep 27 16:12:18 1999
+++ xterm-118/Makefile.in Tue Oct 5 20:23:59 1999
@@ -9,7 +9,7 @@
CPP = @CPP@
LINK = $(CC) $(CFLAGS)
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ @XTERM_USR@ @XTERM_GRP@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
X_CFLAGS = @X_CFLAGS@
@@ -108,7 +108,7 @@
install-full \
install :: $(INSTALL_DIRS) xterm resize
- $(INSTALL_PROGRAM) -s -m @XTERM_MODE@ xterm $(BINDIR)/xterm
+ $(srcdir)/sinstall.sh "$(INSTALL_PROGRAM)" xterm @XTERM_PATH@ $(BINDIR)/xterm
$(INSTALL_PROGRAM) -s -m 755 resize $(BINDIR)/resize
$(INSTALL_DATA) $(srcdir)/xterm.man $(MANDIR)/xterm.$(manext)
$(INSTALL_DATA) $(srcdir)/resize.man $(MANDIR)/resize.$(manext)
@@ -150,7 +150,10 @@
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
realclean: distclean
- -$(RM) tags TAGS
+ -$(RM) tags TAGS ctlseqs.ps
+
+ctlseqs.ps : ctlseqs.ms
+ tbl ctlseqs.ms | groff -ms >$@
lint:
lint $(CPPFLAGS) $(SRCS1)
Index: aclocal.m4
--- xterm-117+/aclocal.m4 Wed Sep 29 21:14:40 1999
+++ xterm-118/aclocal.m4 Tue Oct 5 07:14:58 1999
@@ -306,7 +306,12 @@
# they are not executed when a cached value exists.)
if test "$cf_cv_lib_tgetent" != no ; then
test "$cf_cv_lib_tgetent" != yes && LIBS="$LIBS $cf_cv_lib_tgetent"
- AC_CHECK_HEADERS(termcap.h)
+ AC_DEFINE(USE_TERMCAP)
+ AC_TRY_COMPILE([
+#include <termcap.h>],[
+#ifdef NCURSES_VERSION
+make an error
+#endif],[AC_DEFINE(HAVE_TERMCAP_H)])
else
# If we didn't find a tgetent() that supports the buffer
# argument, look again to see whether we can find even
@@ -462,6 +467,35 @@
AC_SUBST(EXTRA_CFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl Check if we must define _GNU_SOURCE to get a reasonable value for
+dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect
+dnl (or misfeature) of glibc2, which breaks portability of many applications,
+dnl since it is interwoven with GNU extensions.
+dnl
+dnl Well, yes we could work around it...
+AC_DEFUN([CF_GNU_SOURCE],
+[
+AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
+AC_TRY_COMPILE([],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_gnu_source=no],
+ [cf_save="$CFLAGS"
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+ AC_TRY_COMPILE([],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_gnu_source=no],
+ [cf_cv_gnu_source=yes])
+ CFLAGS="$cf_save"
+ ])
+])
+test "$cf_cv_gnu_source" = yes && CFLAGS="$CFLAGS -D_GNU_SOURCE"
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl ---------------------------------------------------------------------------
dnl Use imake to obtain compiler flags. We could, in principle, write tests to
dnl get these, but if imake is properly configured there is no point in doing
dnl this.
@@ -768,7 +802,9 @@
#include <lastlog.h> /* may conflict with utmpx.h on Linux */
#endif
],
- [struct $cf_header x],
+ [struct $cf_header x;
+ char *name = x.ut_name; /* HP-UX 10.x omits this in utmpx.h */
+ ],
[cf_cv_have_utmp=$cf_header
break])
done
@@ -824,79 +860,6 @@
dnl Use AC_VERBOSE w/o the warnings
AC_DEFUN([CF_VERBOSE],
[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl Check if xterm is installed setuid/setgid, assume we want to do the same on a
-dnl new install
-AC_DEFUN([CF_XTERM_MODE],[
-AC_PATH_PROG(XTERM_PATH,xterm)
-XTERM_MODE=755
-XTERM_USR=
-XTERM_GRP=
-AC_MSG_CHECKING(for presumed installation-mode)
-if test -f "$XTERM_PATH" ; then
- cf_option="-l -L"
-
- # Expect listing to have fields like this:
- #-r--r--r-- 1 user group 34293 Jul 18 16:29 pathname
- ls $cf_option $XTERM_PATH >conftest.out
- read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
- echo "if \"$cf_rest\" is null, try the -g option" 1>&AC_FD_CC
- if test -z "$cf_rest" ; then
- cf_option="$cf_option -g"
- ls $cf_option $XTERM_PATH >conftest.out
- read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
- fi
-
- # If we have a pathname, and the date fields look right, assume we've
- # captured the group as well.
- echo "if \"$cf_rest\" is null, we do not look for group" 1>&AC_FD_CC
- if test -n "$cf_rest" ; then
-changequote(,)dnl
- cf_test=`echo "${cf_date2}${cf_date3}" | sed -e 's/[0-9:]//g'`
-changequote([,])dnl
- echo "if we have date in proper columns ($cf_date1 $cf_date2 $cf_date3), \"$cf_test\" is null" 1>&AC_FD_CC
- if test -z "$cf_test" ; then
- XTERM_USR=$cf_usr;
- XTERM_GRP=$cf_grp;
- fi
- fi
- echo "derived user \"$XTERM_USR\", group \"$XTERM_GRP\" of previously-installed xterm" 1>&AC_FD_CC
-
- echo "see if mode \"$cf_mode\" has s-bit set" 1>&AC_FD_CC
- case ".$cf_mode" in #(vi
- .???s*) #(vi
- XTERM_MODE=4711
- XTERM_GRP=
- ;;
- .??????s*)
- XTERM_MODE=2711
- XTERM_USR=
- ;;
- esac
-fi
-
-if test -n "${XTERM_USR}${XTERM_GRP}" ; then
-changequote(,)dnl
- cf_usr=`id | sed -e 's/^[^(]*(//' -e 's/).*$//'`
- cf_grp=`id | sed -e 's/^.* gid=[^(]*(//' -e 's/).*$//'`
-changequote([,])dnl
- echo "configuring as user \"$cf_usr\", group \"$cf_grp\" of previously-installed xterm" 1>&AC_FD_CC
- test "$XTERM_USR" = "$cf_usr" && XTERM_USR=""
- test "$XTERM_USR" = "root" && XTERM_USR=""
- test "$XTERM_GRP" = "$cf_grp" && XTERM_GRP=""
- test "$XTERM_GRP" = "root" && XTERM_GRP=""
- test "$XTERM_GRP" = "wheel" && XTERM_GRP=""
-fi
-
-AC_MSG_RESULT($XTERM_MODE $XTERM_USR $XTERM_GRP)
-
-test -n "$XTERM_USR" && XTERM_USR="-o $XTERM_USR"
-test -n "$XTERM_GRP" && XTERM_GRP="-g $XTERM_GRP"
-
-AC_SUBST(XTERM_MODE)
-AC_SUBST(XTERM_USR)
-AC_SUBST(XTERM_GRP)
])dnl
dnl ---------------------------------------------------------------------------
dnl Check for Xaw (Athena) libraries
Index: configure
--- xterm-117+/configure Wed Sep 29 21:14:45 1999
+++ xterm-118/configure Tue Oct 5 07:23:07 1999
@@ -1652,46 +1652,33 @@
# they are not executed when a cached value exists.)
if test "$cf_cv_lib_tgetent" != no ; then
test "$cf_cv_lib_tgetent" != yes && LIBS="$LIBS $cf_cv_lib_tgetent"
- for ac_hdr in termcap.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1660: 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 1665 "configure"
+ cat >> confdefs.h <<\EOF
+#define USE_TERMCAP 1
+EOF
+
+ cat > conftest.$ac_ext <<EOF
+#line 1661 "configure"
#include "confdefs.h"
-#include <$ac_hdr>
+
+#include <termcap.h>
+int main() {
+
+#ifdef NCURSES_VERSION
+make an error
+#endif
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1670: \"$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
+if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ cat >> confdefs.h <<\EOF
+#define HAVE_TERMCAP_H 1
+EOF
+
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
-
else
# If we didn't find a tgetent() that supports the buffer
# argument, look again to see whether we can find even
@@ -1699,7 +1686,7 @@
# validate values for the TERM environment variable given to
# child processes.
echo $ac_n "checking for partial tgetent function""... $ac_c" 1>&6
-echo "configure:1703: checking for partial tgetent function" >&5
+echo "configure:1690: checking for partial tgetent function" >&5
if eval "test \"`echo '$''{'cf_cv_lib_part_tgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1708,14 +1695,14 @@
for cf_termlib in $cf_TERMLIB ; do
LIBS="$cf_save_LIBS -l$cf_termlib"
cat > conftest.$ac_ext <<EOF
-#line 1712 "configure"
+#line 1699 "configure"
#include "confdefs.h"
int main() {
tgetent(0, 0)
; return 0; }
EOF
-if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "there is a terminfo/tgetent in $cf_termlib" 1>&5
cf_cv_lib_part_tgetent="-l$cf_termlib"
@@ -1738,17 +1725,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1742: checking for $ac_hdr" >&5
+echo "configure:1729: 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 1747 "configure"
+#line 1734 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1739: \"$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*
@@ -1789,17 +1776,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1793: checking for $ac_hdr" >&5
+echo "configure:1780: 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 1798 "configure"
+#line 1785 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1790: \"$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*
@@ -1826,13 +1813,13 @@
done
echo $ac_n "checking for lastlog path""... $ac_c" 1>&6
-echo "configure:1830: checking for lastlog path" >&5
+echo "configure:1817: checking for lastlog path" >&5
if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1836 "configure"
+#line 1823 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1847,7 +1834,7 @@
char *path = _PATH_LASTLOG
; return 0; }
EOF
-if { (eval echo configure:1851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_path_lastlog="_PATH_LASTLOG"
else
@@ -1873,7 +1860,7 @@
echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6
-echo "configure:1877: checking for utmp implementation" >&5
+echo "configure:1864: checking for utmp implementation" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1881,7 +1868,7 @@
cf_cv_have_utmp=no
for cf_header in utmpx utmp ; do
cat > conftest.$ac_ext <<EOF
-#line 1885 "configure"
+#line 1872 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1892,10 +1879,12 @@
#endif
int main() {
-struct $cf_header x
+struct $cf_header x;
+ char *name = x.ut_name; /* HP-UX 10.x omits this in utmpx.h */
+
; return 0; }
EOF
-if { (eval echo configure:1899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp=$cf_header
break
@@ -1923,13 +1912,13 @@
if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6
-echo "configure:1927: checking if utmp.ut_host is declared" >&5
+echo "configure:1916: checking if utmp.ut_host is declared" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1933 "configure"
+#line 1922 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1938,7 +1927,7 @@
struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
; return 0; }
EOF
-if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_host=yes
else
@@ -1962,13 +1951,13 @@
if test $cf_cv_have_utmp != no ; then
echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6
-echo "configure:1966: checking if utmp.ut_xtime is declared" >&5
+echo "configure:1955: 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 1972 "configure"
+#line 1961 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1977,7 +1966,7 @@
struct $cf_cv_have_utmp x; long y = x.ut_xtime
; return 0; }
EOF
-if { (eval echo configure:1981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp_ut_xtime=yes
else
@@ -2000,13 +1989,13 @@
echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6
-echo "configure:2004: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "configure:1993: 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
cat > conftest.$ac_ext <<EOF
-#line 2010 "configure"
+#line 1999 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2020,7 +2009,7 @@
endutent();
; return 0; }
EOF
-if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_sysv_utmp=yes
else
@@ -2045,13 +2034,13 @@
### checks for structures
echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:2049: checking for declaration of fd_set" >&5
+echo "configure:2038: checking for declaration of fd_set" >&5
if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2055 "configure"
+#line 2044 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2059,7 +2048,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:2063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/types.h
else
@@ -2067,7 +2056,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2071 "configure"
+#line 2060 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2076,7 +2065,7 @@
fd_set x
; return 0; }
EOF
-if { (eval echo configure:2080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_fd_set=sys/select.h
else
@@ -2100,14 +2089,14 @@
echo $ac_n "checking if POSIX VDISABLE symbol should be used""... $ac_c" 1>&6
-echo "configure:2104: checking if POSIX VDISABLE symbol should be used" >&5
+echo "configure:2093: 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 2111 "configure"
+#line 2100 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -2125,7 +2114,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_posix_vdisable=yes
else
@@ -2137,7 +2126,7 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2141 "configure"
+#line 2130 "configure"
#include "confdefs.h"
#if HAVE_TERMIOS_H && HAVE_TCGETATTR
@@ -2150,7 +2139,7 @@
int main() { exit(_POSIX_VDISABLE == -1); }
#endif
EOF
-if { (eval echo configure:2154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2143: \"$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
@@ -2176,13 +2165,13 @@
echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:2180: checking if external errno is declared" >&5
+echo "configure:2169: 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 2186 "configure"
+#line 2175 "configure"
#include "confdefs.h"
#if HAVE_STDLIB_H
@@ -2195,7 +2184,7 @@
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:2199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'errno'=yes'
else
@@ -2226,13 +2215,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:2230: checking if external errno exists" >&5
+echo "configure:2219: 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 2236 "configure"
+#line 2225 "configure"
#include "confdefs.h"
#undef errno
@@ -2242,7 +2231,7 @@
errno = 2
; return 0; }
EOF
-if { (eval echo configure:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2235: \"$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
@@ -2274,7 +2263,7 @@
echo $ac_n "checking for tty group""... $ac_c" 1>&6
-echo "configure:2278: checking for tty group" >&5
+echo "configure:2267: 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
@@ -2283,7 +2272,7 @@
cf_cv_tty_group=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 2287 "configure"
+#line 2276 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2297,7 +2286,7 @@
}
EOF
-if { (eval echo configure:2301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2290: \"$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
@@ -2320,13 +2309,81 @@
### checks for compiler characteristics
+
+echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+echo "configure:2315: 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
+
+cf_cv_ansi_cc=no
+cf_save_CFLAGS="$CFLAGS"
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX -qlanglvl=ansi
+# Ultrix and OSF/1 -std1
+# HP-UX -Aa -D_HPUX_SOURCE
+# SVR4 -Xc
+# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)
+for cf_arg in "-DCC_HAS_PROTOS" \
+ "" \
+ -qlanglvl=ansi \
+ -std1 \
+ "-Aa -D_HPUX_SOURCE +e" \
+ "-Aa -D_HPUX_SOURCE" \
+ -Xc
+do
+ CFLAGS="$cf_save_CFLAGS $cf_arg"
+ cat > conftest.$ac_ext <<EOF
+#line 2339 "configure"
+#include "confdefs.h"
+
+#ifndef CC_HAS_PROTOS
+#if !defined(__STDC__) || (__STDC__ != 1)
+choke me
+#endif
+#endif
+
+int main() {
+
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+; return 0; }
+EOF
+if { (eval echo configure:2355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_ansi_cc="$cf_arg"; break
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+CFLAGS="$cf_save_CFLAGS"
+
+fi
+
+echo "$ac_t""$cf_cv_ansi_cc" 1>&6
+
+if test "$cf_cv_ansi_cc" != "no"; then
+if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
+ CFLAGS="$CFLAGS $cf_cv_ansi_cc"
+else
+ cat >> confdefs.h <<\EOF
+#define CC_HAS_PROTOS 1
+EOF
+
+fi
+fi
+
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2325: checking for working const" >&5
+echo "configure:2382: 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 2330 "configure"
+#line 2387 "configure"
#include "confdefs.h"
int main() {
@@ -2375,7 +2432,7 @@
; return 0; }
EOF
-if { (eval echo configure:2379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2396,83 +2453,15 @@
fi
-echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2401: 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
-
-cf_cv_ansi_cc=no
-cf_save_CFLAGS="$CFLAGS"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX -Aa -D_HPUX_SOURCE
-# SVR4 -Xc
-# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)
-for cf_arg in "-DCC_HAS_PROTOS" \
- "" \
- -qlanglvl=ansi \
- -std1 \
- "-Aa -D_HPUX_SOURCE +e" \
- "-Aa -D_HPUX_SOURCE" \
- -Xc
-do
- CFLAGS="$cf_save_CFLAGS $cf_arg"
- cat > conftest.$ac_ext <<EOF
-#line 2425 "configure"
-#include "confdefs.h"
-
-#ifndef CC_HAS_PROTOS
-#if !defined(__STDC__) || (__STDC__ != 1)
-choke me
-#endif
-#endif
-
-int main() {
-
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-; return 0; }
-EOF
-if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- cf_cv_ansi_cc="$cf_arg"; break
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-CFLAGS="$cf_save_CFLAGS"
-
-fi
-
-echo "$ac_t""$cf_cv_ansi_cc" 1>&6
-
-if test "$cf_cv_ansi_cc" != "no"; then
-if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
- CFLAGS="$CFLAGS $cf_cv_ansi_cc"
-else
- cat >> confdefs.h <<\EOF
-#define CC_HAS_PROTOS 1
-EOF
-
-fi
-fi
-
-
### 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:2471: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2460: 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 2476 "configure"
+#line 2465 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2488,7 +2477,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2509,12 +2498,70 @@
fi
+
+echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
+echo "configure:2504: 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 2510 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:2520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_gnu_source=no
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_save="$CFLAGS"
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+ cat > conftest.$ac_ext <<EOF
+#line 2530 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:2540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_gnu_source=no
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_gnu_source=yes
+fi
+rm -f conftest*
+ CFLAGS="$cf_save"
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_gnu_source" 1>&6
+test "$cf_cv_gnu_source" = yes && CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
# If we find X, set shell vars x_includes and x_libraries to the
# paths, otherwise set no_x=yes.
# 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:2518: checking for X" >&5
+echo "configure:2565: checking for X" >&5
# Check whether --with-x or --without-x was given.
@@ -2577,12 +2624,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2581 "configure"
+#line 2628 "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:2586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2633: \"$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*
@@ -2651,14 +2698,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
+#line 2702 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2709: \"$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.
@@ -2758,7 +2805,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:2762: checking for open in -lc_s" >&5
+echo "configure:2809: 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
@@ -2766,7 +2813,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2770 "configure"
+#line 2817 "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
@@ -2777,7 +2824,7 @@
open()
; return 0; }
EOF
-if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2828: \"$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
@@ -2794,7 +2841,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:2798: checking for gethostname in -lbsd" >&5
+echo "configure:2845: 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
@@ -2802,7 +2849,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2806 "configure"
+#line 2853 "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
@@ -2813,7 +2860,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2864: \"$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,7 +2877,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:2834: checking for gethostname in -lnsl_s" >&5
+echo "configure:2881: 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
@@ -2838,7 +2885,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#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
@@ -2849,7 +2896,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+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
@@ -2866,7 +2913,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:2870: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:2917: 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
@@ -2874,7 +2921,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2878 "configure"
+#line 2925 "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
@@ -2885,7 +2932,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2936: \"$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
@@ -2902,7 +2949,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:2906: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:2953: 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
@@ -2910,7 +2957,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2914 "configure"
+#line 2961 "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
@@ -2921,7 +2968,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2972: \"$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
@@ -2962,7 +3009,7 @@
;;
*)
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:2966: checking for socket in -lsocket" >&5
+echo "configure:3013: 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
@@ -2970,7 +3017,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2974 "configure"
+#line 3021 "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
@@ -2981,7 +3028,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3032: \"$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
@@ -3009,7 +3056,7 @@
fi
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3013: checking for gethostname in -lnsl" >&5
+echo "configure:3060: 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
@@ -3017,7 +3064,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3021 "configure"
+#line 3068 "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
@@ -3028,7 +3075,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3079,17 +3126,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:3083: checking whether -R must be followed by a space" >&5
+echo "configure:3130: 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 3086 "configure"
+#line 3133 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3105,14 +3152,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3109 "configure"
+#line 3156 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3144,7 +3191,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:3148: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3195: 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
@@ -3152,7 +3199,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3156 "configure"
+#line 3203 "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
@@ -3163,7 +3210,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3214: \"$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
@@ -3185,7 +3232,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:3189: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3236: 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
@@ -3193,7 +3240,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3197 "configure"
+#line 3244 "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
@@ -3204,7 +3251,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3255: \"$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
@@ -3233,12 +3280,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:3237: checking for gethostbyname" >&5
+echo "configure:3284: 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 3242 "configure"
+#line 3289 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3261,7 +3308,7 @@
; return 0; }
EOF
-if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3312: \"$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
@@ -3282,7 +3329,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3286: checking for gethostbyname in -lnsl" >&5
+echo "configure:3333: 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
@@ -3290,7 +3337,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3294 "configure"
+#line 3341 "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
@@ -3301,7 +3348,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3352: \"$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
@@ -3331,12 +3378,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:3335: checking for connect" >&5
+echo "configure:3382: 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 3340 "configure"
+#line 3387 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3359,7 +3406,7 @@
; return 0; }
EOF
-if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3410: \"$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
@@ -3380,7 +3427,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3384: checking for connect in -lsocket" >&5
+echo "configure:3431: 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
@@ -3388,7 +3435,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3392 "configure"
+#line 3439 "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
@@ -3399,7 +3446,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:3403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3450: \"$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
@@ -3423,12 +3470,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:3427: checking for remove" >&5
+echo "configure:3474: 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 3432 "configure"
+#line 3479 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3451,7 +3498,7 @@
; return 0; }
EOF
-if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3502: \"$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
@@ -3472,7 +3519,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3476: checking for remove in -lposix" >&5
+echo "configure:3523: 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
@@ -3480,7 +3527,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3484 "configure"
+#line 3531 "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
@@ -3491,7 +3538,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:3495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3542: \"$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
@@ -3515,12 +3562,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3519: checking for shmat" >&5
+echo "configure:3566: 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 3524 "configure"
+#line 3571 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3543,7 +3590,7 @@
; return 0; }
EOF
-if { (eval echo configure:3547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3594: \"$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
@@ -3564,7 +3611,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3568: checking for shmat in -lipc" >&5
+echo "configure:3615: 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
@@ -3572,7 +3619,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3576 "configure"
+#line 3623 "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
@@ -3583,7 +3630,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:3587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3634: \"$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
@@ -3616,7 +3663,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:3620: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3667: 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
@@ -3624,7 +3671,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3628 "configure"
+#line 3675 "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
@@ -3635,7 +3682,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3686: \"$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
@@ -3662,7 +3709,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3666: checking for XOpenDisplay in -lX11" >&5
+echo "configure:3713: 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
@@ -3670,7 +3717,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3674 "configure"
+#line 3721 "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
@@ -3681,7 +3728,7 @@
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3732: \"$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
@@ -3702,7 +3749,7 @@
fi
echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3706: checking for XtAppInitialize in -lXt" >&5
+echo "configure:3753: 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
@@ -3710,7 +3757,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3714 "configure"
+#line 3761 "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
@@ -3721,7 +3768,7 @@
XtAppInitialize()
; return 0; }
EOF
-if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3772: \"$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
@@ -3777,17 +3824,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3781: checking for $ac_hdr" >&5
+echo "configure:3828: 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 3786 "configure"
+#line 3833 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3838: \"$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*
@@ -3835,7 +3882,7 @@
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:3839: checking for XextCreateExtension in -lXext" >&5
+echo "configure:3886: 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
@@ -3843,7 +3890,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3847 "configure"
+#line 3894 "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 +3901,7 @@
XextCreateExtension()
; 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:3905: \"$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
@@ -3890,13 +3937,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:3894: checking for $cf_test in $cf_path" >&5
+echo "configure:3941: checking for $cf_test in $cf_path" >&5
else
echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:3897: checking for $cf_test" >&5
+echo "configure:3944: checking for $cf_test" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 3900 "configure"
+#line 3947 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -3905,7 +3952,7 @@
; return 0; }
EOF
-if { (eval echo configure:3909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_result=yes
else
@@ -3931,21 +3978,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:3935: checking for $cf_lib in $cf_path" >&5
+echo "configure:3982: 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:3939: checking for $cf_test in $cf_lib" >&5
+echo "configure:3986: checking for $cf_test in $cf_lib" >&5
fi
cat > conftest.$ac_ext <<EOF
-#line 3942 "configure"
+#line 3989 "configure"
#include "confdefs.h"
int main() {
$cf_test()
; return 0; }
EOF
-if { (eval echo configure:3949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -3991,12 +4038,12 @@
for ac_func in grantpt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3995: checking for $ac_func" >&5
+echo "configure:4042: 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 4000 "configure"
+#line 4047 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4019,7 +4066,7 @@
; return 0; }
EOF
-if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4070: \"$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
@@ -4041,7 +4088,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4045: checking for openpty in -lutil" >&5
+echo "configure:4092: 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
@@ -4049,7 +4096,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4053 "configure"
+#line 4100 "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
@@ -4060,7 +4107,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4111: \"$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
@@ -4091,11 +4138,10 @@
done
-
# 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:4099: checking for $ac_word" >&5
+echo "configure:4145: 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
@@ -4127,83 +4173,18 @@
echo "$ac_t""no" 1>&6
fi
-XTERM_MODE=755
-XTERM_USR=
-XTERM_GRP=
-echo $ac_n "checking for presumed installation-mode""... $ac_c" 1>&6
-echo "configure:4135: checking for presumed installation-mode" >&5
-if test -f "$XTERM_PATH" ; then
- cf_option="-l -L"
-
- # Expect listing to have fields like this:
- #-r--r--r-- 1 user group 34293 Jul 18 16:29 pathname
- ls $cf_option $XTERM_PATH >conftest.out
- read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
- echo "if \"$cf_rest\" is null, try the -g option" 1>&5
- if test -z "$cf_rest" ; then
- cf_option="$cf_option -g"
- ls $cf_option $XTERM_PATH >conftest.out
- read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
- fi
-
- # If we have a pathname, and the date fields look right, assume we've
- # captured the group as well.
- echo "if \"$cf_rest\" is null, we do not look for group" 1>&5
- if test -n "$cf_rest" ; then
- cf_test=`echo "${cf_date2}${cf_date3}" | sed -e 's/[0-9:]//g'`
- echo "if we have date in proper columns ($cf_date1 $cf_date2 $cf_date3), \"$cf_test\" is null" 1>&5
- if test -z "$cf_test" ; then
- XTERM_USR=$cf_usr;
- XTERM_GRP=$cf_grp;
- fi
- fi
- echo "derived user \"$XTERM_USR\", group \"$XTERM_GRP\" of previously-installed xterm" 1>&5
-
- echo "see if mode \"$cf_mode\" has s-bit set" 1>&5
- case ".$cf_mode" in #(vi
- .???s*) #(vi
- XTERM_MODE=4711
- XTERM_GRP=
- ;;
- .??????s*)
- XTERM_MODE=2711
- XTERM_USR=
- ;;
- esac
-fi
-
-if test -n "${XTERM_USR}${XTERM_GRP}" ; then
- cf_usr=`id | sed -e 's/^[^(]*(//' -e 's/).*$//'`
- cf_grp=`id | sed -e 's/^.* gid=[^(]*(//' -e 's/).*$//'`
- echo "configuring as user \"$cf_usr\", group \"$cf_grp\" of previously-installed xterm" 1>&5
- test "$XTERM_USR" = "$cf_usr" && XTERM_USR=""
- test "$XTERM_USR" = "root" && XTERM_USR=""
- test "$XTERM_GRP" = "$cf_grp" && XTERM_GRP=""
- test "$XTERM_GRP" = "root" && XTERM_GRP=""
- test "$XTERM_GRP" = "wheel" && XTERM_GRP=""
-fi
-
-echo "$ac_t""$XTERM_MODE $XTERM_USR $XTERM_GRP" 1>&6
-
-test -n "$XTERM_USR" && XTERM_USR="-o $XTERM_USR"
-test -n "$XTERM_GRP" && XTERM_GRP="-g $XTERM_GRP"
-
-
-
-
-
for ac_func in \
XkbStdBell \
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4202: checking for $ac_func" >&5
+echo "configure:4183: 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 4207 "configure"
+#line 4188 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4226,7 +4207,7 @@
; return 0; }
EOF
-if { (eval echo configure:4230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4211: \"$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
@@ -4252,7 +4233,7 @@
echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:4256: checking if we should use imake to help" >&5
+echo "configure:4237: 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
@@ -4277,7 +4258,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:4281: checking for $ac_word" >&5
+echo "configure:4262: 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
@@ -4416,7 +4397,7 @@
echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:4420: checking for default terminal-id" >&5
+echo "configure:4401: 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
@@ -4437,7 +4418,7 @@
echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:4441: checking for default terminal-type" >&5
+echo "configure:4422: 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
@@ -4454,7 +4435,7 @@
echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:4458: checking for private terminfo-directory" >&5
+echo "configure:4439: 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
@@ -4491,7 +4472,7 @@
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:4495: checking if you want active-icons" >&5
+echo "configure:4476: 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
@@ -4517,7 +4498,7 @@
fi
echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:4521: checking if you want ANSI color" >&5
+echo "configure:4502: 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
@@ -4543,7 +4524,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:4547: checking if you want 16 colors like aixterm" >&5
+echo "configure:4528: 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
@@ -4567,7 +4548,7 @@
echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
-echo "configure:4571: checking if you want 256 colors" >&5
+echo "configure:4552: 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
@@ -4594,7 +4575,7 @@
else
echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
-echo "configure:4598: checking if you want 88 colors" >&5
+echo "configure:4579: 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
@@ -4625,7 +4606,7 @@
fi
echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
-echo "configure:4629: checking if you want blinking cursor" >&5
+echo "configure:4610: 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
@@ -4651,7 +4632,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:4655: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:4636: 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
@@ -4675,7 +4656,7 @@
echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4679: checking if you want color-mode enabled by default" >&5
+echo "configure:4660: 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
@@ -4701,7 +4682,7 @@
fi
echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:4705: checking if you want support for color highlighting" >&5
+echo "configure:4686: 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
@@ -4725,7 +4706,7 @@
echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:4729: checking if you want support for doublesize characters" >&5
+echo "configure:4710: 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
@@ -4749,7 +4730,7 @@
echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:4753: checking if you want fallback-support for box characters" >&5
+echo "configure:4734: 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
@@ -4773,7 +4754,7 @@
echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:4777: checking if you want support for HP-style function keys" >&5
+echo "configure:4758: 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
@@ -4799,7 +4780,7 @@
fi
echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:4803: checking if you want support for internationalization" >&5
+echo "configure:4784: checking if you want support for internationalization" >&5
# Check whether --enable-i18n or --disable-i18n was given.
if test "${enable_i18n+set}" = set; then
@@ -4825,7 +4806,7 @@
fi
echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:4829: checking if you want support for initial-erase setup" >&5
+echo "configure:4810: 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
@@ -4851,7 +4832,7 @@
fi
echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:4855: checking if you want support for input-method" >&5
+echo "configure:4836: 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
@@ -4871,13 +4852,13 @@
echo "$ac_t""$enable_ximp" 1>&6
echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
-echo "configure:4875: checking if X libraries support input-method" >&5
+echo "configure:4856: 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 4881 "configure"
+#line 4862 "configure"
#include "confdefs.h"
#include <X11/IntrinsicP.h>
@@ -4904,7 +4885,7 @@
; return 0; }
EOF
-if { (eval echo configure:4908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_input_method=yes
else
@@ -4927,7 +4908,7 @@
fi
echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:4931: checking if you want support for logging" >&5
+echo "configure:4912: checking if you want support for logging" >&5
# Check whether --enable-logging or --disable-logging was given.
if test "${enable_logging+set}" = set; then
@@ -4951,7 +4932,7 @@
EOF
echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:4955: checking if you want to allow logging via a pipe" >&5
+echo "configure:4936: 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
@@ -4978,7 +4959,7 @@
fi
echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:4982: checking if you want support for iconify/maximize translations" >&5
+echo "configure:4963: 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
@@ -5002,7 +4983,7 @@
echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:5006: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:4987: 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
@@ -5026,7 +5007,7 @@
echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:5030: checking if you want support for right-scrollbar" >&5
+echo "configure:5011: 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
@@ -5052,7 +5033,7 @@
fi
echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:5056: checking if you want check for redundant name-change" >&5
+echo "configure:5037: 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
@@ -5076,7 +5057,7 @@
echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:5080: checking if you want support for tek4014" >&5
+echo "configure:5061: checking if you want support for tek4014" >&5
# Check whether --enable-tek4014 or --disable-tek4014 was given.
if test "${enable_tek4014+set}" = set; then
@@ -5106,7 +5087,7 @@
fi
echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
-echo "configure:5110: checking if you want pulldown menus with a toolbar" >&5
+echo "configure:5091: 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
@@ -5130,7 +5111,7 @@
echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:5134: checking if you want VT52 emulation" >&5
+echo "configure:5115: checking if you want VT52 emulation" >&5
# Check whether --enable-vt52 or --disable-vt52 was given.
if test "${enable_vt52+set}" = set; then
@@ -5154,7 +5135,7 @@
echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:5158: checking if you want wide-character support" >&5
+echo "configure:5139: 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
@@ -5183,7 +5164,7 @@
fi
echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
-echo "configure:5187: checking if you want DECterm Locator support" >&5
+echo "configure:5168: 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
@@ -5209,7 +5190,7 @@
fi
echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:5213: checking if you want -ziconbeep option" >&5
+echo "configure:5194: checking if you want -ziconbeep option" >&5
# Check whether --enable-ziconbeep or --disable-ziconbeep was given.
if test "${enable_ziconbeep+set}" = set; then
@@ -5234,7 +5215,7 @@
# development/testing aids
echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:5238: checking if you want debugging traces" >&5
+echo "configure:5219: checking if you want debugging traces" >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -5263,7 +5244,7 @@
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:5267: checking if you want to see long compiling messages" >&5
+echo "configure:5248: 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
@@ -5303,7 +5284,7 @@
echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:5307: checking if you want magic cookie emulation" >&5
+echo "configure:5288: 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
@@ -5332,7 +5313,7 @@
if test -n "$GCC" ; then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:5336: checking if you want to turn on gcc warnings" >&5
+echo "configure:5317: 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
@@ -5372,9 +5353,9 @@
if test -n "$GCC"
then
echo "checking for gcc __attribute__ directives" 1>&6
-echo "configure:5376: checking for gcc __attribute__ directives" >&5
+echo "configure:5357: checking for gcc __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 5378 "configure"
+#line 5359 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -5412,7 +5393,7 @@
EOF
;;
esac
- if { (eval echo configure:5416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5397: \"$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
@@ -5429,11 +5410,11 @@
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 5433 "configure"
+#line 5414 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for gcc warning options" 1>&6
-echo "configure:5437: checking for gcc warning options" >&5
+echo "configure:5418: checking for gcc warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -5451,7 +5432,7 @@
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:5455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5436: \"$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"
@@ -5628,9 +5609,6 @@
s%@X_LIBS@%$X_LIBS%g
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
s%@XTERM_PATH@%$XTERM_PATH%g
-s%@XTERM_MODE@%$XTERM_MODE%g
-s%@XTERM_USR@%$XTERM_USR%g
-s%@XTERM_GRP@%$XTERM_GRP%g
s%@IMAKE@%$IMAKE%g
s%@IMAKE_CFLAGS@%$IMAKE_CFLAGS%g
s%@IMAKE_LOADFLAGS@%$IMAKE_LOADFLAGS%g
Index: configure.in
--- xterm-117+/configure.in Mon Sep 27 16:12:18 1999
+++ xterm-118/configure.in Mon Oct 4 21:26:59 1999
@@ -75,13 +75,14 @@
CF_TTY_GROUP
### checks for compiler characteristics
-AC_CONST
CF_ANSI_CC_CHECK
+AC_CONST
### checks for system services and user specified options
AC_HEADER_SYS_WAIT
+CF_GNU_SOURCE
CF_X_TOOLKIT
# Change CPPFLAGS temporarily so that checks for X include files will
@@ -111,7 +112,7 @@
# available. E.g. for GNU libc 2.0.
AC_CHECK_FUNCS(grantpt, [], AC_CHECK_LIB(util,openpty))
-CF_XTERM_MODE
+AC_PATH_PROG(XTERM_PATH,xterm)
AC_CHECK_FUNCS( \
XkbStdBell \
Index: ctlseqs.ms
--- xterm-117+/ctlseqs.ms Mon Sep 27 16:12:18 1999
+++ xterm-118/ctlseqs.ms Tue Oct 5 21:00:23 1999
@@ -202,8 +202,10 @@
.[] bS \\e
.[] { {
.[] ] ]
+.[] & &
.[] ^ ^
.[] _ _
+.[] qu \`
.[] ` \`
.[] a a
.[] b b
@@ -242,6 +244,7 @@
.ds Cy \fIC\v'.3m'\h'-.2m'\s-2y\s0\v'-.3m'\fP
.ds Pb \fIP\v'.3m'\h'-.2m'\s-2b\s0\v'-.3m'\fP
.ds Pc \fIP\v'.3m'\h'-.2m'\s-2c\s0\v'-.3m'\fP
+.ds Pe \fIP\v'.3m'\h'-.2m'\s-2e\s0\v'-.3m'\fP
.ds Pl \fIP\v'.3m'\h'-.2m'\s-2l\s0\v'-.3m'\fP
.ds Pm \fIP\v'.3m'\h'-.2m'\s-2m\s0\v'-.3m'\fP
.ds Pp \fIP\v'.3m'\h'-.2m'\s-2p\s0\v'-.3m'\fP
@@ -561,47 +564,6 @@
.IP \\*(Cs\\*(Ps\\*s\\*@
Insert \*(Ps (Blank) Character(s) (default = 1) (ICH)
.
-.IP \\*(Cs\\*(Ps\\*s\\*'\\*s\\*|
-Request Locator Position (DECRQLP)
-.br
-Valid values for the parameter are:
- \*(Ps = \*0, 1 or omitted \(-> transmit a single DECLRP locator report
-.sp
-If Locator Reporting has been enabled by a DECELR, xterm will respond
-with a DECLRP Locator Report. This report is also generated on button
-up and down events if they have been enabled with a DECSLE, or when
-the locator is detected outside of a filter rectangle, if filter rectangles
-have been enabled with a DECEFR.
-.sp
- \(-> \*(Cs\*(Ps\*s\*;\*(Ps\*s\*;\*(Ps\*s\*;\*(Ps\*s\*;\*(Ps\*s\\&\*s\*w
-.sp
-Parameters are [event;button;row;column;page].
-.br
-Valid values for the event:
- \*(Ps = \*0 \(-> locator unavailable - no other parameters sent
- \*(Ps = \*1 \(-> request - xterm received a DECRQLP
- \*(Ps = \*2 \(-> left button down
- \*(Ps = \*3 \(-> left button up
- \*(Ps = \*4 \(-> middle button down
- \*(Ps = \*5 \(-> middle button up
- \*(Ps = \*6 \(-> right button down
- \*(Ps = \*7 \(-> right button up
- \*(Ps = \*8 \(-> M4 button down
- \*(Ps = \*9 \(-> M4 button up
- \*(Ps = \*1\*0 \(-> locator outside filter rectangle
-.br
-``button'' parameter is a bitmask indicating which buttons are pressed:
- \*(Ps = \*0 \(-> no buttons down
- \*(Ps & \*1 \(-> right button down
- \*(Ps & \*2 \(-> middle button down
- \*(Ps & \*4 \(-> left button down
- \*(Ps & \*8 \(-> M4 button down
-.br
-``row'' and ``column'' parameters are the coordinates of the locator
-position in the xterm window, encoded as ASCII decimal.
-.br
-The ``page'' parameter is not used by xterm, and will be omitted.
-.
.IP \\*(Cs\\*(Ps\\*s\\*A
Cursor Up \*(Ps Times (default = 1) (CUU)
.
@@ -1000,7 +962,7 @@
\*(Os\*s\*l\*s\fItitle\fP\*s\*(ST
\*(Ps >= \*2\*4 \(-> Resize to \*(Ps lines (DECSLPP)
.
-.IP \\*(Cs\\*(Pt\\*s\\*;\\*(Pl\\*s\\*;\\*s\\*(Pb\\*s\\*;\\*s\\*(Pr\\*s\\*s\\*'\\*s\\*w
+.IP \\*(Cs\\*(Pt\\*s\\*;\\*(Pl\\*s\\*;\\*(Pb\\*s\\*;\\*(Pr\\*s\\*(qu\\*w
Enable Filter Rectangle (DECEFR)
.br
Parameters are [top;left;bottom;right].
@@ -1016,7 +978,7 @@
.IP \\*(Cs\\*(Ps\\*s\\*x
Request Terminal Parameters (DECREQTPARM)
.
-.IP \\*(Cs\\*(Ps\\*s\\*;\\*(Pu\\*s\\*s\\*'\\*s\\*z
+.IP \\*(Cs\\*(Ps\\*s\\*;\\*(Pu\\*s\\*(qu\\*z
Enable Locator Reporting (DECELR)
.br
Valid values for the first parameter:
@@ -1031,7 +993,7 @@
\*(Pu = \*1 \(-> device physical pixels
\*(Pu = \*2 \(-> character cells
.
-.IP \\*(Cs\\*(Pm\\*s\\*s\\*'\\*s\\*{
+.IP \\*(Cs\\*(Pm\\*s\\*(qu\\*{
Select Locator Events (DECSLE)
.br
Valid values for the first (and any additional parameters) are:
@@ -1041,6 +1003,48 @@
\*(Ps = \*2 \(-> do not report button down transitions
\*(Ps = \*3 \(-> report button up transitions
\*(Ps = \*4 \(-> do not report button up transitions
+.
+.IP \\*(Cs\\*(Ps\\*s\\*(qu\\*|
+Request Locator Position (DECRQLP)
+.br
+Valid values for the parameter are:
+ \*(Ps = \*0, 1 or omitted \(-> transmit a single DECLRP locator report
+.sp
+If Locator Reporting has been enabled by a DECELR, xterm will respond
+with a DECLRP Locator Report. This report is also generated on button
+up and down events if they have been enabled with a DECSLE, or when
+the locator is detected outside of a filter rectangle, if filter rectangles
+have been enabled with a DECEFR.
+.sp
+ \(-> \*(Cs\*(Pe\*s\*;\*(Pb\*s\*;\*(Pr\*s\*;\*(Pc\*s\*;\*(Pp\*s\*&\*s\*w
+.sp
+Parameters are [event;button;row;column;page].
+.br
+Valid values for the event:
+ \*(Pe = \*0 \(-> locator unavailable - no other parameters sent
+ \*(Pe = \*1 \(-> request - xterm received a DECRQLP
+ \*(Pe = \*2 \(-> left button down
+ \*(Pe = \*3 \(-> left button up
+ \*(Pe = \*4 \(-> middle button down
+ \*(Pe = \*5 \(-> middle button up
+ \*(Pe = \*6 \(-> right button down
+ \*(Pe = \*7 \(-> right button up
+ \*(Pe = \*8 \(-> M4 button down
+ \*(Pe = \*9 \(-> M4 button up
+ \*(Pe = \*1\*0 \(-> locator outside filter rectangle
+.br
+``button'' parameter is a bitmask indicating which buttons are pressed:
+ \*(Pb = \*0 \(-> no buttons down
+ \*(Pb & \*1 \(-> right button down
+ \*(Pb & \*2 \(-> middle button down
+ \*(Pb & \*4 \(-> left button down
+ \*(Pb & \*8 \(-> M4 button down
+.br
+``row'' and ``column'' parameters are the coordinates of the locator
+position in the xterm window, encoded as ASCII decimal.
+.br
+The ``page'' parameter is not used by xterm, and will be omitted.
+.
.Ed
.
.St
Index: data.h
--- xterm-117+/data.h Mon Sep 27 16:12:18 1999
+++ xterm-118/data.h Sun Oct 3 22:25:54 1999
@@ -108,7 +108,7 @@
#endif
#if OPT_WIDE_CHARS
-const unsigned short dec2ucs[32];
+extern const unsigned short dec2ucs[32];
#endif
#endif /* included_data_h */
Index: main.c
--- xterm-117+/main.c Wed Sep 29 19:29:08 1999
+++ xterm-118/main.c Mon Oct 4 05:10:33 1999
@@ -4290,7 +4290,8 @@
#ifdef DEBUG
if (debug) fputs ("Exiting\n", stderr);
#endif
- Cleanup (0);
+ if (!hold_screen)
+ Cleanup (0);
}
} while ( (pid=nonblocking_wait()) > 0);
Index: misc.c
--- xterm-117+/misc.c Mon Sep 27 16:12:18 1999
+++ xterm-118/misc.c Sun Oct 3 22:36:32 1999
@@ -1728,7 +1728,14 @@
void
Cleanup (int code)
{
+ static Boolean cleaning;
register TScreen *screen;
+
+ if (cleaning) {
+ hold_screen = 0;
+ return;
+ }
+ cleaning = TRUE;
TRACE(("Cleanup %d\n", code))
Index: resize.c
--- xterm-117+/resize.c Wed Sep 29 06:09:39 1999
+++ xterm-118/resize.c Tue Oct 5 07:09:42 1999
@@ -31,6 +31,13 @@
#ifdef HAVE_CONFIG_H
#include <xtermcfg.h>
+
+#else
+
+#if defined(__EMX__) || defined(__CYGWIN__) || defined(SCO) || defined(sco)
+#define USE_TERMCAP 1
+#endif
+
#endif
#include <X11/Xos.h>
@@ -62,7 +69,6 @@
#if defined(__EMX__) || defined(__CYGWIN__)
#define USE_SYSV_TERMIO
-#define USE_TERMCAP
#endif
#ifdef macII
@@ -70,10 +76,6 @@
#undef SYSV /* pretend to be bsd */
#endif /* macII */
-#if defined(SCO) || defined(sco)
-#define USE_TERMCAP
-#endif
-
#ifdef linux
#define USE_TERMIOS
#endif
@@ -98,7 +100,7 @@
#elif defined(__QNX__)
#define USE_TERMINFO
#include <unix.h>
-#else
+#elif !defined(USE_TERMCAP)
#define USE_TERMCAP
#endif /* SYSV */
Index: sinstall.sh
--- /dev/null Tue May 5 16:32:27 1998
+++ xterm-118/sinstall.sh Tue Oct 5 06:04:07 1999
@@ -0,0 +1,93 @@
+#!/bin/sh
+# $XFree86$
+#
+# Install program setuid if the installer is running as root, and if xterm is
+# already installed on the system with setuid privilege. This is a safeguard
+# for ordinary users installing xterm for themselves on systems where the
+# setuid is not needed to access a PTY, but only for things like utmp.
+#
+# Parameters:
+# $1 = program to invoke as "install"
+# $2 = program to install
+# $3 = previously-installed program, for reference
+# $4 = final installed-path, if different from reference
+#
+#
+trace=:
+trace=echo
+
+SINSTALL="$1"
+NEW_PROG="$2"
+REF_PROG="$3"
+TST_PROG="$4"
+
+test -z "$SINSTALL" && SINSTALL=install
+test -z "$NEW_PROG" && NEW_PROG=xterm
+test -z "$REF_PROG" && REF_PROG=/usr/bin/X11/xterm
+test -z "$TST_PROG" && REF_PROG="$REF_PROG"
+
+PROG_MODE=755
+PROG_USR=
+PROG_GRP=
+
+echo checking for presumed installation-mode
+if test -f "$REF_PROG" ; then
+ cf_option="-l -L"
+ MYTEMP=${TMPDIR-/tmp}/sinstall$$
+
+ # Expect listing to have fields like this:
+ #-r--r--r-- 1 user group 34293 Jul 18 16:29 pathname
+ ls $cf_option $REF_PROG >$MYTEMP
+ read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <$MYTEMP
+ $trace "... if \"$cf_rest\" is null, try the ls -g option"
+ if test -z "$cf_rest" ; then
+ cf_option="$cf_option -g"
+ ls $cf_option $REF_PROG >$MYTEMP
+ read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <$MYTEMP
+ fi
+ rm -f $MYTEMP
+
+ # If we have a pathname, and the date fields look right, assume we've
+ # captured the group as well.
+ $trace "... if \"$cf_rest\" is null, we do not look for group"
+ if test -n "$cf_rest" ; then
+ cf_test=`echo "${cf_date2}${cf_date3}" | sed -e 's/[0-9:]//g'`
+ $trace "... if we have date in proper columns ($cf_date1 $cf_date2 $cf_date3), \"$cf_test\" is null"
+ if test -z "$cf_test" ; then
+ PROG_USR=$cf_usr;
+ PROG_GRP=$cf_grp;
+ fi
+ fi
+ $trace "... derived user \"$PROG_USR\", group \"$PROG_GRP\" of previously-installed $NEW_PROG"
+
+ $trace "... see if mode \"$cf_mode\" has s-bit set"
+ case ".$cf_mode" in #(vi
+ .???s*) #(vi
+ PROG_MODE=4711
+ PROG_GRP=
+ ;;
+ .??????s*)
+ PROG_MODE=2711
+ PROG_USR=
+ ;;
+ esac
+fi
+
+if test -n "${PROG_USR}${PROG_GRP}" ; then
+ cf_usr=`id | sed -e 's/^[^(]*(//' -e 's/).*$//'`
+ cf_grp=`id | sed -e 's/^.* gid=[^(]*(//' -e 's/).*$//'`
+ $trace "... installing $NEW_PROG as user \"$cf_usr\", group \"$cf_grp\""
+ if test "$cf_usr" != "root" ; then
+ PROG_MODE=755
+ PROG_USR=""
+ PROG_GRP=""
+ fi
+ test "$PROG_USR" = "$cf_usr" && PROG_USR=""
+ test "$PROG_GRP" = "$cf_grp" && PROG_GRP=""
+fi
+
+test -n "$PROG_USR" && PROG_USR="-o $PROG_USR"
+test -n "$PROG_GRP" && PROG_GRP="-g $PROG_GRP"
+
+echo "$SINSTALL -m $PROG_MODE $PROG_USR $PROG_GRP $NEW_PROG $TST_PROG"
+eval "$SINSTALL -m $PROG_MODE $PROG_USR $PROG_GRP $NEW_PROG $TST_PROG"
Index: version.h
--- xterm-117+/version.h Wed Sep 29 06:11:39 1999
+++ xterm-118/version.h Tue Oct 5 06:43:09 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 117
+#define XTERM_PATCH 118
#define XFREE86_VERSION "XFree86 3.9.16b"
Index: xterm.log.html
--- xterm-117+/xterm.log.html Wed Sep 29 19:34:50 1999
+++ xterm-118/xterm.log.html Tue Oct 5 20:52:09 1999
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_118">Patch #118 - 1999/10/5 - XFree86 3.9.16b</A>
<LI><A HREF="#xterm_117">Patch #117 - 1999/9/29 - XFree86 3.9.16b</A>
<LI><A HREF="#xterm_116">Patch #116 - 1999/9/25 - XFree86 3.9.16a</A>
<LI><A HREF="#xterm_115">Patch #115 - 1999/9/18 - XFree86 3.9.16a</A>
@@ -160,6 +161,34 @@
<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_118">Patch #118 - 1999/10/5 - XFree86 3.9.16b</A></H1>
+<ul>
+ <li>refine configure test for utmp versus utmpx, to build on HP-UX 10.x
+ (reported by David Ellement).
+
+ <li>move the configure check for <code>const</code> after the check
+ for ANSI C compiler options, since those may be required to make
+ it work properly on HP-UX.
+
+ <li>add configure test for defining <code>_GNU_SOURCE</code>
+
+ <li>correction to <em>-hold</em> option, ensure that if data is already
+ in the output buffer that it will be displayed before closing the
+ PTY.
+
+ <li>move the configure checks for setuid install of xterm into a script
+ to avoid installing it setuid'd to a non-root user (reported by
+ Adam Sulmicki <adam@cfar.umd.edu>).
+
+ <li>correct configure script's check for termcap.h to avoid using
+ ncurses' version of it on systems that have a working
+ <code>tgetent()</code> function. This is needed to make
+ <code>resize</code> work properly.
+
+ <li>fix some typography in ctlseqs.ms description of DEC locator events
+ (reported by Steve Wall).
+</ul>
<H1><A NAME="xterm_117">Patch #117 - 1999/9/29 - XFree86 3.9.16b</A></H1>
<ul>
Index: xtermcfg.hin
--- xterm-117+/xtermcfg.hin Wed Sep 29 20:55:02 1999
+++ xterm-118/xtermcfg.hin Tue Oct 5 07:04:58 1999
@@ -87,6 +87,7 @@
#undef USE_OK_BCOPY /* CF_FUNC_MEMMOVE */
#undef USE_SYSV_UTMP /* CF_UTMP */
#undef USE_SYS_SELECT_H /* CF_TYPE_FD_SET */
+#undef USE_TERMCAP /* CF_FUNC_TGETENT */
#undef USE_TERMINFO /* CF_FUNC_TGETENT */
#undef USE_TTY_GROUP /* CF_TTY_GROUP */
#undef UTMPX_FOR_UTMP /* CF_UTMP */