diff options
-rw-r--r-- | ansi.c | 21 | ||||
-rw-r--r-- | config.h.in | 5 | ||||
-rwxr-xr-x | configure | 6433 | ||||
-rw-r--r-- | debian/README.Debian | 53 | ||||
-rw-r--r-- | debian/README.terminfo | 5 | ||||
-rw-r--r-- | debian/changelog | 388 | ||||
-rw-r--r-- | debian/config | 10 | ||||
-rw-r--r-- | debian/control | 21 | ||||
-rw-r--r-- | debian/copyright | 27 | ||||
-rw-r--r-- | debian/dirs | 2 | ||||
-rw-r--r-- | debian/docs | 10 | ||||
-rw-r--r-- | debian/info | 6 | ||||
-rw-r--r-- | debian/manpages | 1 | ||||
-rw-r--r-- | debian/postinst | 22 | ||||
-rw-r--r-- | debian/postrm | 16 | ||||
-rw-r--r-- | debian/preinst | 58 | ||||
-rwxr-xr-x | debian/rules | 92 | ||||
-rw-r--r-- | debian/screen.lintian.overrides | 2 | ||||
-rw-r--r-- | debian/screen.pam | 6 | ||||
-rw-r--r-- | debian/screenrc | 108 | ||||
-rw-r--r-- | debian/templates | 8 | ||||
-rw-r--r-- | debian/templates.de | 13 | ||||
-rw-r--r-- | debian/templates.es | 14 | ||||
-rw-r--r-- | debian/templates.fr | 14 | ||||
-rw-r--r-- | debian/templates.ru | 13 | ||||
-rw-r--r-- | display.c | 9 | ||||
-rw-r--r-- | doc/screen.1 | 22 | ||||
-rw-r--r-- | doc/screen.texinfo | 26 | ||||
-rw-r--r-- | encoding.c | 18 | ||||
-rw-r--r-- | mark.c | 1 | ||||
-rw-r--r-- | process.c | 17 | ||||
-rw-r--r-- | resize.c | 11 | ||||
-rw-r--r-- | screen.c | 32 | ||||
-rw-r--r-- | terminfo/screencap | 2 | ||||
-rw-r--r-- | terminfo/screeninfo.src | 28 | ||||
-rw-r--r-- | window.h | 4 |
36 files changed, 3067 insertions, 4451 deletions
@@ -245,7 +245,7 @@ struct win *p; { p->w_gr = nwin_default.gr; p->w_c1 = nwin_default.c1; - SetCharsets(p, "BBBB02"); + SetCharsets(p, "BBBBB02"); if (nwin_default.charset) SetCharsets(p, nwin_default.charset); #ifdef ENCODINGS @@ -260,7 +260,7 @@ char *s; { int i; - for (i = 0; i < 4 && *s; i++, s++) + for (i = 0; i < 5 && *s; i++, s++) if (*s != '.') p->w_charsets[i] = ((*s == 'B') ? ASCII : *s); if (*s && *s++ != '.') @@ -580,7 +580,7 @@ register int len; { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - if (curr->w_NumArgs < MAXARGS) + if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS) { if (curr->w_args[curr->w_NumArgs] < 100000000) curr->w_args[curr->w_NumArgs] = @@ -1277,7 +1277,8 @@ int c, intermediate; break; # endif curr->w_charsets[0] = curr->w_charsets[1] = - curr->w_charsets[2] = curr->w_charsets[2] = + curr->w_charsets[2] = curr->w_charsets[3] = + curr->w_charsets[4] = curr->w_FontL = curr->w_FontR = ASCII; curr->w_Charset = 0; curr->w_CharsetR = 2; @@ -1481,7 +1482,7 @@ StringEnd() case AKA: if (curr->w_title == curr->w_akabuf && !*curr->w_string) break; - ChangeAKA(curr, curr->w_string, 20); + ChangeAKA(curr, curr->w_string, strlen(curr->w_string)); if (!*curr->w_string) curr->w_autoaka = curr->w_y + 1; break; @@ -1626,7 +1627,7 @@ MapCharsetR(n) int n; { curr->w_ss = 0; - if (curr->w_CharsetR != n) + if (curr->w_CharsetR != n && curr->w_CharsetR != 4) { curr->w_CharsetR = n; curr->w_FontR = curr->w_charsets[n]; @@ -1647,7 +1648,7 @@ SaveCursor() curr->w_SavedCharset = curr->w_Charset; curr->w_SavedCharsetR = curr->w_CharsetR; bcopy((char *) curr->w_charsets, (char *) curr->w_SavedCharsets, - 4 * sizeof(int)); + 5 * sizeof(int)); #endif } @@ -1662,7 +1663,7 @@ RestoreCursor() curr->w_rend = curr->w_SavedRend; #ifdef FONT bcopy((char *) curr->w_SavedCharsets, (char *) curr->w_charsets, - 4 * sizeof(int)); + 5 * sizeof(int)); curr->w_Charset = curr->w_SavedCharset; curr->w_CharsetR = curr->w_SavedCharsetR; curr->w_ss = 0; @@ -2097,8 +2098,8 @@ struct win *p; char *s; int l; { - if (l > 20) - l = 20; + if (l > MAXAKA) + l = MAXAKA; strncpy(p->w_akachange, s, l); p->w_akachange[l] = 0; p->w_title = p->w_akachange; diff --git a/config.h.in b/config.h.in index e96e9fb..974ab55 100644 --- a/config.h.in +++ b/config.h.in @@ -37,6 +37,11 @@ #define MAXWIN 40 /* + * Maximum length of window title + */ +#define MAXAKA 60 + +/* * Define SOCKDIR to be the directory to contain the named sockets * screen creates. This should be in a common subdirectory, such as * /usr/local or /tmp. It makes things a little more secure if you @@ -1,120 +1,42 @@ #! /bin/sh -# From configure.in Revision: 1.18 . -# Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. + +# From configure.in Revision: 1.18 # Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 - -# -# Initializations. -# +# Defaults: +ac_help= ac_default_prefix=/usr/local -cross_compiling=no -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -ac_unique_file="screen.c" +# Any additions from configure.in: +ac_help="$ac_help + --disable-socket-dir disable system wide socket-dir and use ~/.screen instead" +ac_help="$ac_help + --with-socket-dir=path where to put the per-user sockets" +ac_help="$ac_help + --enable-pam enable PAM support" +ac_help="$ac_help + --enable-locale use localized month/day names" +ac_help="$ac_help + --enable-telnet enable builtin telnet" +ac_help="$ac_help + --enable-colors256 enable support for 256 colors" +ac_help="$ac_help + --enable-rxvt_osc enable support for rxvt OSC codes" +ac_help="$ac_help + --with-sys-screenrc=path where to put the global screenrc file" # Initialize some variables set by options. -ac_init_help= -ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -cache_file=/dev/null +build=NONE +cache_file=./config.cache exec_prefix=NONE +host=NONE no_create= +nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -123,15 +45,10 @@ program_transform_name=s,x,x, silent= site= srcdir= +target=NONE verbose= x_includes=NONE x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -145,16 +62,17 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= for ac_option do + # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -162,59 +80,59 @@ do continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case "$ac_option" in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; + bindir="$ac_optarg" ;; -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; + ac_prev=build ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; + build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; + cache_file="$ac_optarg" ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir=$ac_optarg ;; + datadir="$ac_optarg" ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; *) ac_optarg=yes ;; esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval "enable_${ac_feature}='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -223,47 +141,95 @@ do -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; + exec_prefix="$ac_optarg" ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; -host | --host | --hos | --ho) - ac_prev=host_alias ;; + ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; + host="$ac_optarg" ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; + includedir="$ac_optarg" ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; + infodir="$ac_optarg" ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; + libdir="$ac_optarg" ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; + libexecdir="$ac_optarg" ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -272,12 +238,12 @@ do -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; + localstatedir="$ac_optarg" ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; + mandir="$ac_optarg" ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. @@ -298,26 +264,26 @@ do -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; + oldincludedir="$ac_optarg" ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; + prefix="$ac_optarg" ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; + program_prefix="$ac_optarg" ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; + program_suffix="$ac_optarg" ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -334,7 +300,7 @@ do | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; + program_transform_name="$ac_optarg" ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -344,7 +310,7 @@ do ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; + sbindir="$ac_optarg" ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -355,57 +321,58 @@ do | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; + sharedstatedir="$ac_optarg" ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site=$ac_optarg ;; + site="$ac_optarg" ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; + srcdir="$ac_optarg" ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; + sysconfdir="$ac_optarg" ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; + ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; + target="$ac_optarg" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + case "$ac_option" in + *=*) ;; *) ac_optarg=yes ;; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`echo $ac_option|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; --x) # Obsolete; use --with-x. @@ -416,98 +383,98 @@ do ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; + x_includes="$ac_optarg" ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; + x_libraries="$ac_optarg" ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" ;; esac done if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; esac done -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: should be removed in autoconf 3.0. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h -test "$silent" = yes && exec 6>/dev/null +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=screen.c # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -518,311 +485,13 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } fi fi -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<EOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -EOF - - cat <<EOF -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] -EOF - - cat <<\EOF -EOF -fi - -if test -n "$ac_init_help"; then - - cat <<\EOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-socket-dir disable system wide socket-dir and use ~/.screen instead - --enable-pam enable PAM support - --enable-locale use localized month/day names - --enable-telnet enable builtin telnet - --enable-colors256 enable support for 256 colors - --enable-rxvt_osc enable support for rxvt OSC codes - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-socket-dir=path where to put the per-user sockets - --with-sys-screenrc=path where to put the global screenrc file - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have - headers in a nonstandard directory <include dir> - CPP C preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -EOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue - cd $ac_subdir - # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` - - case $srcdir in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; - esac - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then - echo - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive - elif test -f $ac_sub_srcdir/configure; then - echo - $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.ac || - test -f $ac_sub_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 - fi - cd $ac_popdir - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\EOF - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -EOF - exit 0 -fi -exec 5>config.log -cat >&5 <<EOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was - - $ $0 $@ - -EOF -{ -cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -PATH = $PATH - -_ASUNAME -} >&5 - -cat >&5 <<EOF -## ------------ ## -## Core tests. ## -## ------------ ## - -EOF - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell meta-characters. -ac_configure_args= -ac_sep= -for ac_arg -do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. -done - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h - -# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then @@ -833,109 +502,43 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:836: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + echo "loading site script $ac_site_file" . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:847: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi + echo "loading cache $cache_file" + . $cache_file else - { echo "$as_me:855: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:871: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:875: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:881: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:883: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:885: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:904: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:906: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + echo "creating cache $cache_file" + > $cache_file fi ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:926: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:929: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +ac_exeext= +ac_objext=o +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi else - ac_path_separator=: + ac_n= ac_c='\c' ac_t= fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh -ac_config_headers="$ac_config_headers config.h" + + + rev=`sed < ${srcdir}/patchlevel.h -n -e '/#define REV/s/#define REV *//p'` vers=`sed < ${srcdir}/patchlevel.h -n -e '/#define VERS/s/#define VERS *//p'` @@ -943,709 +546,301 @@ pat=`sed < ${srcdir}/patchlevel.h -n -e '/#define PATCHLEVEL/s/#define PATCHLEVE VERSION="$rev.$vers.$pat" echo "this is screen version $VERSION" 1>&6 + if test "x$prefix" = xNONE; then - echo $ECHO_N "checking for prefix by $ECHO_C" >&6 - # Extract the first word of "screen", so it can be a program name with args. +echo $ac_n "checking for prefix by $ac_c" 1>&6 +# Extract the first word of "screen", so it can be a program name with args. set dummy screen; ac_word=$2 -echo "$as_me:950: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_SCREEN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:556: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_SCREEN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $SCREEN in - [\\/]* | ?:[\\/]*) + case "$SCREEN" in + /*) ac_cv_path_SCREEN="$SCREEN" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_SCREEN="$SCREEN" # Let the user override the test with a dos path. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_SCREEN="$ac_dir/$ac_word" - echo "$as_me:967: found $ac_dir/$ac_word" >&5 - break -fi -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_SCREEN="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -SCREEN=$ac_cv_path_SCREEN - +SCREEN="$ac_cv_path_SCREEN" if test -n "$SCREEN"; then - echo "$as_me:978: result: $SCREEN" >&5 -echo "${ECHO_T}$SCREEN" >&6 + echo "$ac_t""$SCREEN" 1>&6 else - echo "$as_me:981: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi if test -n "$ac_cv_path_SCREEN"; then - prefix=`$as_expr X"$ac_cv_path_SCREEN" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_cv_path_SCREEN" : 'X\(//\)[^/]' \| \ - X"$ac_cv_path_SCREEN" : 'X\(//\)$' \| \ - X"$ac_cv_path_SCREEN" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_cv_path_SCREEN" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - prefix=`$as_expr X"$prefix" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$prefix" : 'X\(//\)[^/]' \| \ - X"$prefix" : 'X\(//\)$' \| \ - X"$prefix" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$prefix" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + prefix=`echo $ac_cv_path_SCREEN|sed 's%/[^/][^/]*//*[^/][^/]*$%%'` fi fi if test "x$prefix" = xNONE; then - echo $ECHO_N "checking for prefix by $ECHO_C" >&6 - # Extract the first word of "gzip", so it can be a program name with args. +echo $ac_n "checking for prefix by $ac_c" 1>&6 +# Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 -echo "$as_me:1015: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GZIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:598: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $GZIP in - [\\/]* | ?:[\\/]*) + case "$GZIP" in + /*) ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GZIP="$GZIP" # Let the user override the test with a dos path. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GZIP="$ac_dir/$ac_word" - echo "$as_me:1032: found $ac_dir/$ac_word" >&5 - break -fi -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GZIP="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -GZIP=$ac_cv_path_GZIP - +GZIP="$ac_cv_path_GZIP" if test -n "$GZIP"; then - echo "$as_me:1043: result: $GZIP" >&5 -echo "${ECHO_T}$GZIP" >&6 + echo "$ac_t""$GZIP" 1>&6 else - echo "$as_me:1046: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi if test -n "$ac_cv_path_GZIP"; then - prefix=`$as_expr X"$ac_cv_path_GZIP" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_cv_path_GZIP" : 'X\(//\)[^/]' \| \ - X"$ac_cv_path_GZIP" : 'X\(//\)$' \| \ - X"$ac_cv_path_GZIP" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_cv_path_GZIP" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - prefix=`$as_expr X"$prefix" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$prefix" : 'X\(//\)[^/]' \| \ - X"$prefix" : 'X\(//\)$' \| \ - X"$prefix" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$prefix" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + prefix=`echo $ac_cv_path_GZIP|sed 's%/[^/][^/]*//*[^/][^/]*$%%'` fi fi -old_CFLAGS="$CFLAGS" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1085: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1100: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1108: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1111: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. +old_CFLAGS="$CFLAGS" +# Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1120: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1135: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1143: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1146: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1159: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:640: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1174: found $ac_dir/$ac_word" >&5 -break -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:1182: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1185: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:1194: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1209: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1217: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1220: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC + echo "$ac_t""$CC" 1>&6 else - CC="$ac_cv_prog_CC" + echo "$ac_t""no" 1>&6 fi -fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1233: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:670: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1253: found $ac_dir/$ac_word" >&5 -break -done - + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# != 0; then + if test $# -gt 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} + set dummy "$ac_dir/$ac_word" "$@" shift ac_cv_prog_CC="$@" fi fi fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:1275: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:1278: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1289: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:721: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1304: found $ac_dir/$ac_word" >&5 -break -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:1312: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:1315: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi - - test -n "$CC" && break - done + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:1328: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1343: found $ac_dir/$ac_word" >&5 -break -done -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1351: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1354: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - test -n "$ac_ct_CC" && break -done +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross - CC=$ac_ct_CC -fi - -fi - -test -z "$CC" && { { echo "$as_me:1366: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:1371:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1374: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:1377: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1379: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:1382: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1384: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:1387: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -#line 1391 "configure" -#include "confdefs.h" +cat > conftest.$ac_ext << EOF -int -main () -{ +#line 764 "configure" +#include "confdefs.h" - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:1407: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1410: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:1413: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1436: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:1442: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:1447: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:1453: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1456: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no +main(){return(0);} +EOF +if { (eval echo configure:769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:1463: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} - { (exit 1); exit 1; }; } - fi + ac_cv_prog_cc_cross=yes fi -fi -echo "$as_me:1471: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:1478: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1480: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:1483: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1485: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:1488: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done else - { { echo "$as_me:1504: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} - { (exit 1); exit 1; }; } + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:1510: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:1516: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:800: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <<EOF +#ifdef __GNUC__ + yes; +#endif +EOF +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes else - cat >conftest.$ac_ext <<_ACEOF -#line 1522 "configure" -#include "confdefs.h" + ac_cv_prog_gcc=no +fi +fi -int -main () -{ +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1534: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1537: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done +if test $ac_cv_prog_gcc = yes; then + GCC=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1549: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} - { (exit 1); exit 1; }; } + GCC= fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:1556: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:1560: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:828: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 1566 "configure" -#include "confdefs.h" - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1581: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1584: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1587: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1590: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_compiler_gnu=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:1602: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:1608: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 1614 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1626: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1629: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1632: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1635: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi -echo "$as_me:1645: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS + CFLAGS="$ac_save_CFLAGS" elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -1659,370 +854,142 @@ else CFLAGS= fi fi -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1672: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1675: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1678: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1681: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line 1693 "configure" -#include "confdefs.h" -#include <stdlib.h> -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1706: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1709: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1712: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1715: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 1725 "configure" -#include "confdefs.h" -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1737: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1740: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1743: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1746: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:1778: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:860: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 1799 "configure" + # not just through cpp. + cat > conftest.$ac_ext <<EOF +#line 875 "configure" #include "confdefs.h" #include <assert.h> - Syntax error -_ACEOF -if { (eval echo "$as_me:1804: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1810: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:881: \"$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 : else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 1833 "configure" + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +#line 892 "configure" #include "confdefs.h" -#include <ac_nonexistent.h> -_ACEOF -if { (eval echo "$as_me:1837: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1843: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:898: \"$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 + : else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:1880: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 1890 "configure" + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 909 "configure" #include "confdefs.h" #include <assert.h> - Syntax error -_ACEOF -if { (eval echo "$as_me:1895: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1901: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:915: \"$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 : else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + rm -rf conftest* + CPP=/lib/cpp fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 1924 "configure" -#include "confdefs.h" -#include <ac_nonexistent.h> -_ACEOF -if { (eval echo "$as_me:1928: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1934: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes +rm -f conftest* fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break +rm -f conftest* fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" else - { { echo "$as_me:1962: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } + ac_cv_prog_CPP="$CPP" fi +echo "$ac_t""$CPP" 1>&6 -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:1974: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 -if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +echo "configure:941: checking whether ${CC-cc} needs -traditional" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -#line 1981 "configure" + cat > conftest.$ac_ext <<EOF +#line 947 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* ac_cv_prog_gcc_traditional=yes else + rm -rf conftest* ac_cv_prog_gcc_traditional=no fi rm -f conftest* + if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -#line 1996 "configure" + cat > conftest.$ac_ext <<EOF +#line 965 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* ac_cv_prog_gcc_traditional=yes fi rm -f conftest* fi fi -echo "$as_me:2009: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 + +echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2016: checking for POSIXized ISC" >&5 -echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 +echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 +echo "configure:987: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then - echo "$as_me:2021: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 ISC=yes # If later tests want to check for ISC. - -cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF @@ -2032,38 +999,27 @@ EOF CC="$CC -Xp" fi else - echo "$as_me:2035: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 ISC= fi + if test "$cross_compiling" = yes; then - { { echo "$as_me:2041: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 2046 "configure" + cat > conftest.$ac_ext <<EOF +#line 1012 "configure" #include "confdefs.h" main(){exit(0);} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2051: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2054: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2056: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2059: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + if test $CC != cc ; then echo "Your $CC failed - restarting with CC=cc" 1>&6 @@ -2075,55 +1031,42 @@ exec $0 $configure_args fi fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + if test "$cross_compiling" = yes; then - { { echo "$as_me:2082: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 2087 "configure" + cat > conftest.$ac_ext <<EOF +#line 1043 "configure" #include "confdefs.h" main(){exit(0);} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2092: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2095: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2097: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2100: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:1047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -exec 5>&2 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + exec 5>&2 eval $ac_link echo "CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;" 1>&6 echo "$ac_compile" 1>&6 -{ { echo "$as_me:2113: error: Can't run the compiler - sorry" >&5 -echo "$as_me: error: Can't run the compiler - sorry" >&2;} - { (exit 1); exit 1; }; } +{ echo "configure: error: Can't run the compiler - sorry" 1>&2; exit 1; } fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + if test "$cross_compiling" = yes; then - { { echo "$as_me:2121: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 2126 "configure" + cat > conftest.$ac_ext <<EOF +#line 1070 "configure" #include "confdefs.h" main() @@ -2132,66 +1075,53 @@ main() __something_strange_(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2137: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2140: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2142: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2145: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - { { echo "$as_me:2147: error: Your compiler does not set the exit status - sorry" >&5 -echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;} - { (exit 1); exit 1; }; } -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +EOF +if { (eval echo configure:1080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + { echo "configure: error: Your compiler does not set the exit status - sorry" 1>&2; exit 1; } +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi +rm -fr conftest* +fi + for ac_prog in mawk gawk nawk awk do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2162: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1096: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2177: found $ac_dir/$ac_word" >&5 -break -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AWK="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -AWK=$ac_cv_prog_AWK +AWK="$ac_cv_prog_AWK" if test -n "$AWK"; then - echo "$as_me:2185: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + echo "$ac_t""$AWK" 1>&6 else - echo "$as_me:2188: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi - test -n "$AWK" && break +test -n "$AWK" && break done + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -2202,20 +1132,14 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:2212: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2224,39 +1148,31 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2232: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:1157: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do - IFS=$ac_save_IFS # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then + if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -2266,274 +1182,229 @@ else ;; esac done + IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install + INSTALL="$ac_cv_path_install" else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL=$ac_install_sh + INSTALL="$ac_install_sh" fi fi -echo "$as_me:2281: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +echo "$ac_t""$INSTALL" 1>&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + if test -f etc/toolcheck; then -{ echo "$as_me:2293: checking for buggy tools..." >&5 -echo "$as_me: checking for buggy tools..." >&6;} +echo "checking for buggy tools" 1>&6 +echo "configure:1212: checking for buggy tools" >&5 sh etc/toolcheck 1>&6 fi -echo "$as_me:2298: checking if a system-wide socket dir should be used" >&5 -echo $ECHO_N "checking if a system-wide socket dir should be used... $ECHO_C" >&6 + + +echo $ac_n "checking if a system-wide socket dir should be used""... $ac_c" 1>&6 +echo "configure:1219: checking if a system-wide socket dir should be used" >&5 # Check whether --enable-socket-dir or --disable-socket-dir was given. if test "${enable_socket_dir+set}" = set; then enableval="$enable_socket_dir" - - echo "$as_me:2304: result: no. ~/.screen will be used instead." >&5 -echo "${ECHO_T}no. ~/.screen will be used instead." >&6 - -else - - echo "$as_me:2309: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - echo "$as_me:2311: checking for the socket dir" >&5 -echo $ECHO_N "checking for the socket dir... $ECHO_C" >&6 + + echo "$ac_t""no. ~/.screen will be used instead." 1>&6 + +else + + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for the socket dir""... $ac_c" 1>&6 +echo "configure:1230: checking for the socket dir" >&5 SOCKDIR="(eff_uid ? \"/tmp/uscreens\" : \"/tmp/screens\")" - -# Check whether --with-socket-dir or --without-socket-dir was given. + # Check whether --with-socket-dir or --without-socket-dir was given. if test "${with_socket_dir+set}" = set; then withval="$with_socket_dir" - SOCKDIR="\"${withval}\"" -fi; - echo "$as_me:2320: result: ${SOCKDIR}" >&5 -echo "${ECHO_T}${SOCKDIR}" >&6 - cat >>confdefs.h <<EOF + SOCKDIR="\"${withval}\"" +fi + + echo "$ac_t""${SOCKDIR}" 1>&6 + cat >> confdefs.h <<EOF #define SOCKDIR $SOCKDIR EOF -fi; + + +fi + + if test -n "$ISC"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define ISC 1 EOF LIBS="$LIBS -linet" fi + if test -f /sysV68 ; then -cat >>confdefs.h <<\EOF +cat >> confdefs.h <<\EOF #define sysV68 1 EOF fi -{ echo "$as_me:2342: checking for MIPS..." >&5 -echo "$as_me: checking for MIPS..." >&6;} +echo "checking for MIPS" 1>&6 +echo "configure:1265: checking for MIPS" >&5 if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then oldlibs="$LIBS" test -f /bin/mx || LIBS="$LIBS -lmld" # for nlist. But not on alpha. -{ echo "$as_me:2347: checking mld library..." >&5 -echo "$as_me: checking mld library..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2350 "configure" +echo "checking mld library" 1>&6 +echo "configure:1270: checking mld library" >&5 +cat > conftest.$ac_ext <<EOF +#line 1272 "configure" #include "confdefs.h" -int -main () -{ +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2362: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2365: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2368: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2371: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$oldlibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$oldlibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* if test -r /dev/ptc; then -cat >>confdefs.h <<\EOF +cat >> confdefs.h <<\EOF #define MIPS 1 EOF -{ echo "$as_me:2385: checking wait3..." >&5 -echo "$as_me: checking wait3..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2388 "configure" +echo "checking wait3" 1>&6 +echo "configure:1294: checking wait3" >&5 +cat > conftest.$ac_ext <<EOF +#line 1296 "configure" #include "confdefs.h" -int -main () -{ +int main() { wait3(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2400: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2403: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2406: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2409: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ echo "$as_me:2415: checking wait2..." >&5 -echo "$as_me: checking wait2..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2418 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "checking wait2" 1>&6 +echo "configure:1310: checking wait2" >&5 +cat > conftest.$ac_ext <<EOF +#line 1312 "configure" #include "confdefs.h" -int -main () -{ +int main() { wait2(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2430: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2433: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2436: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2439: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define USE_WAIT2 1 EOF LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi fi -{ echo "$as_me:2456: checking for Ultrix..." >&5 -echo "$as_me: checking for Ultrix..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2459 "configure" + +echo "checking for Ultrix" 1>&6 +echo "configure:1338: checking for Ultrix" >&5 +cat > conftest.$ac_ext <<EOF +#line 1340 "configure" #include "confdefs.h" #if defined(ultrix) || defined(__ultrix) yes; #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* ULTRIX=1 fi rm -f conftest* + if test -f /usr/lib/libpyr.a ; then oldlibs="$LIBS" LIBS="$LIBS -lpyr" -{ echo "$as_me:2475: checking Pyramid OSX..." >&5 -echo "$as_me: checking Pyramid OSX..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2478 "configure" +echo "checking Pyramid OSX" 1>&6 +echo "configure:1359: checking Pyramid OSX" >&5 +cat > conftest.$ac_ext <<EOF +#line 1361 "configure" #include "confdefs.h" -int -main () -{ +int main() { open_controlling_pty("") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2490: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2493: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2496: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2499: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define OSX 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$oldlibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$oldlibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -{ echo "$as_me:2513: checking for butterfly..." >&5 -echo "$as_me: checking for butterfly..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2516 "configure" +echo "checking for butterfly" 1>&6 +echo "configure:1384: checking for butterfly" >&5 +cat > conftest.$ac_ext <<EOF +#line 1386 "configure" #include "confdefs.h" #if defined(butterfly) yes; #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* butterfly=1 fi rm -f conftest* + if test -z "$butterfly"; then if test -n "$ULTRIX"; then test -z "$GCC" && CC="$CC -YBSD" fi -{ echo "$as_me:2533: checking for POSIX.1..." >&5 -echo "$as_me: checking for POSIX.1..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2536 "configure" +echo "checking for POSIX.1" 1>&6 +echo "configure:1406: checking for POSIX.1" >&5 +cat > conftest.$ac_ext <<EOF +#line 1408 "configure" #include "confdefs.h" #include <sys/types.h> #include <unistd.h> @@ -2542,11 +1413,12 @@ main () { yes; #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* echo "- you have a POSIX system" 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define POSIX 1 EOF posix=1 @@ -2555,219 +1427,180 @@ rm -f conftest* fi -{ echo "$as_me:2558: checking for System V..." >&5 -echo "$as_me: checking for System V..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2561 "configure" +echo "checking for System V" 1>&6 +echo "configure:1432: checking for System V" >&5 +cat > conftest.$ac_ext <<EOF +#line 1434 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> #include <fcntl.h> -int -main () -{ +int main() { int x = SIGCHLD | FNDELAY; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2575: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2578: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2581: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2584: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >>confdefs.h <<\EOF + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat >> confdefs.h <<\EOF #define SYSV 1 EOF fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:2597: checking for sequent/ptx..." >&5 -echo "$as_me: checking for sequent/ptx..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2600 "configure" +echo "checking for sequent/ptx" 1>&6 +echo "configure:1457: checking for sequent/ptx" >&5 +cat > conftest.$ac_ext <<EOF +#line 1459 "configure" #include "confdefs.h" #ifdef _SEQUENT_ yes; #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* LIBS="$LIBS -lsocket -linet";seqptx=1 fi rm -f conftest* + oldlibs="$LIBS" LIBS="$LIBS -lelf" -{ echo "$as_me:2615: checking SVR4..." >&5 -echo "$as_me: checking SVR4..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2618 "configure" +echo "checking SVR4" 1>&6 +echo "configure:1477: checking SVR4" >&5 +cat > conftest.$ac_ext <<EOF +#line 1479 "configure" #include "confdefs.h" #include <utmpx.h> -int -main () -{ +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2631: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2634: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2637: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2640: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:2642: checking for dwarf.h" >&5 -echo $ECHO_N "checking for dwarf.h... $ECHO_C" >&6 -if test "${ac_cv_header_dwarf_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2648 "configure" +; return 0; } +EOF +if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_safe=`echo "dwarf.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for dwarf.h""... $ac_c" 1>&6 +echo "configure:1491: checking for dwarf.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 1496 "configure" #include "confdefs.h" #include <dwarf.h> -_ACEOF -if { (eval echo "$as_me:2652: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2658: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_dwarf_h=yes -else - echo "$as_me: failed program was:" >&5 +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1501: \"$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 - ac_cv_header_dwarf_h=no + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:2677: result: $ac_cv_header_dwarf_h" >&5 -echo "${ECHO_T}$ac_cv_header_dwarf_h" >&6 -if test $ac_cv_header_dwarf_h = yes; then - cat >>confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF #define SVR4 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define BUGGYGETLOGIN 1 EOF else - echo "$as_me:2688: checking for elf.h" >&5 -echo $ECHO_N "checking for elf.h... $ECHO_C" >&6 -if test "${ac_cv_header_elf_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for elf.h""... $ac_c" 1>&6 +echo "configure:1528: checking for elf.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 <<_ACEOF -#line 2694 "configure" + cat > conftest.$ac_ext <<EOF +#line 1533 "configure" #include "confdefs.h" #include <elf.h> -_ACEOF -if { (eval echo "$as_me:2698: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2704: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_elf_h=yes -else - echo "$as_me: failed program was:" >&5 +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1538: \"$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 - ac_cv_header_elf_h=no + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:2723: result: $ac_cv_header_elf_h" >&5 -echo "${ECHO_T}$ac_cv_header_elf_h" >&6 -if test $ac_cv_header_elf_h = yes; then - cat >>confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF #define SVR4 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define BUGGYGETLOGIN 1 EOF +else + echo "$ac_t""no" 1>&6 fi fi + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$oldlibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$oldlibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:2744: checking for Solaris 2.x..." >&5 -echo "$as_me: checking for Solaris 2.x..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2747 "configure" +echo "checking for Solaris 2.x" 1>&6 +echo "configure:1577: checking for Solaris 2.x" >&5 +cat > conftest.$ac_ext <<EOF +#line 1579 "configure" #include "confdefs.h" #if defined(SVR4) && defined(sun) yes #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* LIBS="$LIBS -lsocket -lnsl -lkstat" fi rm -f conftest* -{ echo "$as_me:2760: checking BSD job jontrol..." >&5 -echo "$as_me: checking BSD job jontrol..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2763 "configure" + + + +echo "checking BSD job jontrol" 1>&6 +echo "configure:1597: checking BSD job jontrol" >&5 +cat > conftest.$ac_ext <<EOF +#line 1599 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/ioctl.h> -int -main () -{ +int main() { #ifdef POSIX tcsetpgrp(0, 0); @@ -2780,44 +1613,31 @@ int y = TIOCNOTTY; #endif #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2788: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2791: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2794: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2797: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* echo "- you have jobcontrol" 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define BSDJOBS 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "- you don't have jobcontrol" 1>&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "- you don't have jobcontrol" 1>&6 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:2812: checking setreuid..." >&5 -echo "$as_me: checking setreuid..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2815 "configure" +echo "checking setreuid" 1>&6 +echo "configure:1636: checking setreuid" >&5 +cat > conftest.$ac_ext <<EOF +#line 1638 "configure" #include "confdefs.h" -int -main () -{ +int main() { #ifdef __hpux setresuid(0, 0, 0); @@ -2825,40 +1645,26 @@ setresuid(0, 0, 0); setreuid(0, 0); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2833: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2836: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2839: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2842: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define HAVE_SETREUID 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -{ echo "$as_me:2853: checking seteuid..." >&5 -echo "$as_me: checking seteuid..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2856 "configure" +rm -f conftest* +echo "checking seteuid" 1>&6 +echo "configure:1663: checking seteuid" >&5 +cat > conftest.$ac_ext <<EOF +#line 1665 "configure" #include "confdefs.h" -int -main () -{ +int main() { #if defined(linux) || defined(NeXT) || defined(_AUX_SOURCE) || defined(AUX) || defined(ultrix) || (defined(sun) && defined(SVR4)) || defined(ISC) || defined(sony_news) seteuid_is_broken(0); @@ -2866,111 +1672,68 @@ seteuid_is_broken(0); seteuid(0); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2874: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2877: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2880: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2883: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define HAVE_SETEUID 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:2895: checking select..." >&5 -echo "$as_me: checking select..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2898 "configure" + +echo "checking select" 1>&6 +echo "configure:1692: checking select" >&5 +cat > conftest.$ac_ext <<EOF +#line 1694 "configure" #include "confdefs.h" -int -main () -{ +int main() { select(0, 0, 0, 0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2910: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2913: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2916: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2919: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$LIBS -lnet -lnsl" -{ echo "$as_me:2926: checking select with $LIBS..." >&5 -echo "$as_me: checking select with $LIBS..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 2929 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$LIBS -lnet -lnsl" +echo "checking select with $LIBS" 1>&6 +echo "configure:1709: checking select with $LIBS" >&5 +cat > conftest.$ac_ext <<EOF +#line 1711 "configure" #include "confdefs.h" -int -main () -{ +int main() { select(0, 0, 0, 0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2941: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2944: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2947: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2950: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:2956: error: !!! no select - no screen" >&5 -echo "$as_me: error: !!! no select - no screen" >&2;} - { (exit 1); exit 1; }; } + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: !!! no select - no screen" 1>&2; exit 1; } fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:2965: checking fifos..." >&5 -echo "$as_me: checking fifos..." >&6;} +echo "checking fifos" 1>&6 +echo "configure:1732: checking fifos" >&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:2968: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 2973 "configure" + cat > conftest.$ac_ext <<EOF +#line 1737 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3037,41 +1800,31 @@ main() exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3042: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3045: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3047: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3050: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:1805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "- your fifos are usable" 1>&6 fifo=1 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "- your fifos are not usable" 1>&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + echo "- your fifos are not usable" 1>&6 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + rm -f /tmp/conftest* if test -n "$fifo"; then -{ echo "$as_me:3066: checking for broken fifo implementation..." >&5 -echo "$as_me: checking for broken fifo implementation..." >&6;} +echo "checking for broken fifo implementation" 1>&6 +echo "configure:1823: checking for broken fifo implementation" >&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:3069: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 3074 "configure" + cat > conftest.$ac_ext <<EOF +#line 1828 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3118,44 +1871,35 @@ main() exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3123: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3126: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3128: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3131: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "- your implementation is ok" 1>&6 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "- you have a broken implementation" 1>&6 - cat >>confdefs.h <<\EOF + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + echo "- you have a broken implementation" 1>&6 + cat >> confdefs.h <<\EOF #define BROKEN_PIPE 1 EOF fifobr=1 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + rm -f /tmp/conftest* fi -{ echo "$as_me:3150: checking sockets..." >&5 -echo "$as_me: checking sockets..." >&6;} + +echo "checking sockets" 1>&6 +echo "configure:1898: checking sockets" >&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:3153: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 3158 "configure" + cat > conftest.$ac_ext <<EOF +#line 1903 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3208,41 +1952,31 @@ main() exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3213: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3216: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3218: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3221: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "- your sockets are usable" 1>&6 sock=1 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "- your sockets are not usable" 1>&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + echo "- your sockets are not usable" 1>&6 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + rm -f /tmp/conftest* if test -n "$sock"; then -{ echo "$as_me:3237: checking socket implementation..." >&5 -echo "$as_me: checking socket implementation..." >&6;} +echo "checking socket implementation" 1>&6 +echo "configure:1975: checking socket implementation" >&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:3240: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 3245 "configure" + cat > conftest.$ac_ext <<EOF +#line 1980 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3270,42 +2004,35 @@ main() exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3275: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3278: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3280: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3283: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "- you are normal" 1>&6 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "- unix domain sockets are not kept in the filesystem" 1>&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + echo "- unix domain sockets are not kept in the filesystem" 1>&6 -cat >>confdefs.h <<\EOF +cat >> confdefs.h <<\EOF #define SOCK_NOT_IN_FS 1 EOF socknofs=1 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + rm -f /tmp/conftest* fi + if test -n "$fifo"; then if test -n "$sock"; then if test -n "$nore"; then echo "- hmmm... better take the fifos" 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define NAMEDPIPE 1 EOF @@ -3315,7 +2042,7 @@ EOF else echo "- both sockets and fifos usable. let's take fifos." 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define NAMEDPIPE 1 EOF @@ -3323,7 +2050,7 @@ EOF else echo "- using named pipes" 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define NAMEDPIPE 1 EOF @@ -3332,20 +2059,17 @@ elif test -n "$sock"; then echo "- using unix-domain sockets" 1>&6 else - { { echo "$as_me:3335: error: you have neither usable sockets nor usable pipes -> no screen" >&5 -echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: you have neither usable sockets nor usable pipes -> no screen" 1>&2; exit 1; } fi -{ echo "$as_me:3340: checking select return value..." >&5 -echo "$as_me: checking select return value..." >&6;} + +echo "checking select return value" 1>&6 +echo "configure:2068: checking select return value" >&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:3343: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 3348 "configure" + cat > conftest.$ac_ext <<EOF +#line 2073 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3363,6 +2087,7 @@ char *nam = "/tmp/conftest$$"; #define S_IFIFO 0010000 #endif + main() { #ifdef FD_SET @@ -3432,6 +2157,7 @@ main() exit(1); #endif + #ifdef FD_SET FD_SET(0, &f); #else @@ -3444,74 +2170,50 @@ main() exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3449: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3452: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3454: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3457: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "- select is ok" 1>&6 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "- select can't count" 1>&6 - cat >>confdefs.h <<\EOF + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + echo "- select can't count" 1>&6 + cat >> confdefs.h <<\EOF #define SELECT_BROKEN 1 EOF fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi -{ echo "$as_me:3474: checking for tgetent..." >&5 -echo "$as_me: checking for tgetent..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 3477 "configure" + +echo "checking for tgetent" 1>&6 +echo "configure:2194: checking for tgetent" >&5 +cat > conftest.$ac_ext <<EOF +#line 2196 "configure" #include "confdefs.h" -int -main () -{ +int main() { tgetent((char *)0, (char *)0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3489: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3492: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3495: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3498: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -olibs="$LIBS" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + olibs="$LIBS" LIBS="-lcurses $olibs" -{ echo "$as_me:3506: checking libcurses..." >&5 -echo "$as_me: checking libcurses..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 3509 "configure" +echo "checking libcurses" 1>&6 +echo "configure:2212: checking libcurses" >&5 +cat > conftest.$ac_ext <<EOF +#line 2214 "configure" #include "confdefs.h" -int -main () -{ +int main() { #ifdef __hpux __sorry_hpux_libcurses_is_totally_broken_in_10_10(); @@ -3519,344 +2221,239 @@ __sorry_hpux_libcurses_is_totally_broken_in_10_10(); tgetent((char *)0, (char *)0); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3527: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3530: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3533: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3536: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="-ltermcap $olibs" -{ echo "$as_me:3543: checking libtermcap..." >&5 -echo "$as_me: checking libtermcap..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 3546 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="-ltermcap $olibs" +echo "checking libtermcap" 1>&6 +echo "configure:2235: checking libtermcap" >&5 +cat > conftest.$ac_ext <<EOF +#line 2237 "configure" #include "confdefs.h" -int -main () -{ +int main() { tgetent((char *)0, (char *)0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3558: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3561: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3564: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3567: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="-ltermlib $olibs" -{ echo "$as_me:3574: checking libtermlib..." >&5 -echo "$as_me: checking libtermlib..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 3577 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="-ltermlib $olibs" +echo "checking libtermlib" 1>&6 +echo "configure:2252: checking libtermlib" >&5 +cat > conftest.$ac_ext <<EOF +#line 2254 "configure" #include "confdefs.h" -int -main () -{ +int main() { tgetent((char *)0, (char *)0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3589: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3592: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3595: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3598: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="-lncurses $olibs" -{ echo "$as_me:3605: checking libncurses..." >&5 -echo "$as_me: checking libncurses..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 3608 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="-lncurses $olibs" +echo "checking libncurses" 1>&6 +echo "configure:2269: checking libncurses" >&5 +cat > conftest.$ac_ext <<EOF +#line 2271 "configure" #include "confdefs.h" -int -main () -{ +int main() { tgetent((char *)0, (char *)0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3620: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3623: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3626: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3629: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:3635: error: !!! no tgetent - no screen" >&5 -echo "$as_me: error: !!! no tgetent - no screen" >&2;} - { (exit 1); exit 1; }; } + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: !!! no tgetent - no screen" 1>&2; exit 1; } fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* if test "$cross_compiling" = yes; then - { { echo "$as_me:3650: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 3655 "configure" + cat > conftest.$ac_ext <<EOF +#line 2300 "configure" #include "confdefs.h" main() { exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3664: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3667: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3669: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3672: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then echo "- you use the termcap database" 1>&6 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "- you use the terminfo database" 1>&6 - cat >>confdefs.h <<\EOF + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + echo "- you use the terminfo database" 1>&6 + cat >> confdefs.h <<\EOF #define TERMINFO 1 EOF fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi -{ echo "$as_me:3688: checking ospeed..." >&5 -echo "$as_me: checking ospeed..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 3691 "configure" + +echo "checking ospeed" 1>&6 +echo "configure:2326: checking ospeed" >&5 +cat > conftest.$ac_ext <<EOF +#line 2328 "configure" #include "confdefs.h" extern short ospeed; -int -main () -{ +int main() { ospeed=5; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3703: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3706: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3709: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3712: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >>confdefs.h <<\EOF + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat >> confdefs.h <<\EOF #define NEED_OSPEED 1 EOF fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:3725: checking for /dev/ptc..." >&5 -echo "$as_me: checking for /dev/ptc..." >&6;} +echo "checking for /dev/ptc" 1>&6 +echo "configure:2349: checking for /dev/ptc" >&5 if test -r /dev/ptc; then -cat >>confdefs.h <<\EOF +cat >> confdefs.h <<\EOF #define HAVE_DEV_PTC 1 EOF fi -{ echo "$as_me:3734: checking for SVR4 ptys..." >&5 -echo "$as_me: checking for SVR4 ptys..." >&6;} +echo "checking for SVR4 ptys" 1>&6 +echo "configure:2358: checking for SVR4 ptys" >&5 if test -c /dev/ptmx ; then -cat >conftest.$ac_ext <<_ACEOF -#line 3738 "configure" +cat > conftest.$ac_ext <<EOF +#line 2361 "configure" #include "confdefs.h" -int -main () -{ +int main() { ptsname(0);grantpt(0);unlockpt(0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3750: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3753: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3756: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3759: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define HAVE_SVR4_PTYS 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi for ac_func in getpt do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3775: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3781 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2384: 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 2389 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ + which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3812: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3815: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3818: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3821: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:3831: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<EOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +; return 0; } EOF +if { (eval echo configure:2412: \"$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 fi done -{ echo "$as_me:3841: checking for ptyranges..." >&5 -echo "$as_me: checking for ptyranges..." >&6;} + +echo "checking for ptyranges" 1>&6 +echo "configure:2438: checking for ptyranges" >&5 if test -d /dev/ptym ; then pdir='/dev/ptym' else pdir='/dev' fi -cat >conftest.$ac_ext <<_ACEOF -#line 3849 "configure" +cat > conftest.$ac_ext <<EOF +#line 2445 "configure" #include "confdefs.h" #ifdef M_UNIX yes; #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* ptys=`echo /dev/ptyp??` else + rm -rf conftest* ptys=`echo $pdir/pty??` fi rm -f conftest* @@ -3864,26 +2461,24 @@ rm -f conftest* if test "$ptys" != "$pdir/pty??" ; then p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` -cat >>confdefs.h <<EOF +cat >> confdefs.h <<EOF #define PTYRANGE0 "$p0" EOF -cat >>confdefs.h <<EOF +cat >> confdefs.h <<EOF #define PTYRANGE1 "$p1" EOF fi -{ echo "$as_me:3877: checking default tty permissions/group..." >&5 -echo "$as_me: checking default tty permissions/group..." >&6;} +echo "checking default tty permissions/group" 1>&6 +echo "configure:2476: checking default tty permissions/group" >&5 rm -f conftest_grp if test "$cross_compiling" = yes; then - { { echo "$as_me:3881: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 3886 "configure" + cat > conftest.$ac_ext <<EOF +#line 2482 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3914,28 +2509,19 @@ main() exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3919: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3922: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3924: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3927: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - +EOF +if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + if test -f conftest_grp; then ptygrp=`cat conftest_grp` echo "- pty mode: 0620, group: $ptygrp" 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define PTYMODE 0620 EOF - cat >>confdefs.h <<EOF + cat >> confdefs.h <<EOF #define PTYGROUP $ptygrp EOF @@ -3945,84 +2531,80 @@ EOF fi else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + WRITEPATH='' XTERMPATH='' # Extract the first word of "write", so it can be a program name with args. set dummy write; ac_word=$2 -echo "$as_me:3956: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_WRITEPATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2544: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_WRITEPATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $WRITEPATH in - [\\/]* | ?:[\\/]*) + case "$WRITEPATH" in + /*) ac_cv_path_WRITEPATH="$WRITEPATH" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_WRITEPATH="$WRITEPATH" # Let the user override the test with a dos path. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_WRITEPATH="$ac_dir/$ac_word" - echo "$as_me:3973: found $ac_dir/$ac_word" >&5 - break -fi -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_WRITEPATH="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -WRITEPATH=$ac_cv_path_WRITEPATH - +WRITEPATH="$ac_cv_path_WRITEPATH" if test -n "$WRITEPATH"; then - echo "$as_me:3984: result: $WRITEPATH" >&5 -echo "${ECHO_T}$WRITEPATH" >&6 + echo "$ac_t""$WRITEPATH" 1>&6 else - echo "$as_me:3987: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi # Extract the first word of "xterm", so it can be a program name with args. set dummy xterm; ac_word=$2 -echo "$as_me:3993: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XTERMPATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2579: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_XTERMPATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $XTERMPATH in - [\\/]* | ?:[\\/]*) + case "$XTERMPATH" in + /*) ac_cv_path_XTERMPATH="$XTERMPATH" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_XTERMPATH="$XTERMPATH" # Let the user override the test with a dos path. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_XTERMPATH="$ac_dir/$ac_word" - echo "$as_me:4010: found $ac_dir/$ac_word" >&5 - break -fi -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_XTERMPATH="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -XTERMPATH=$ac_cv_path_XTERMPATH - +XTERMPATH="$ac_cv_path_XTERMPATH" if test -n "$XTERMPATH"; then - echo "$as_me:4021: result: $XTERMPATH" >&5 -echo "${ECHO_T}$XTERMPATH" >&6 + echo "$ac_t""$XTERMPATH" 1>&6 else - echo "$as_me:4024: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi found= @@ -4042,16 +2624,16 @@ fi fi fi if test -n "$WRITEPATH$XTERMPATH"; then - found=`find $WRITEPATH $XTERMPATH $findfollow -perm -2000 -print` + found=`find $WRITEPATH $XTERMPATH $findfollow -perm -2000 -print` if test -n "$found"; then ptygrp=`ls -ln$lsfollow $found | sed -n -e 1p | $AWK '{print $4}'` echo "- pty mode: 0620, group: $ptygrp" 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define PTYMODE 0620 EOF - cat >>confdefs.h <<EOF + cat >> confdefs.h <<EOF #define PTYGROUP $ptygrp EOF @@ -4063,16 +2645,18 @@ EOF echo "- can't determine - assume ptys are world accessable" 1>&6 fi + fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + rm -f conftest_grp -{ echo "$as_me:4072: checking getutent..." >&5 -echo "$as_me: checking getutent..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4075 "configure" +echo "checking getutent" 1>&6 +echo "configure:2658: checking getutent" >&5 +cat > conftest.$ac_ext <<EOF +#line 2660 "configure" #include "confdefs.h" #include <time.h> /* to get time_t on SCO */ @@ -4087,39 +2671,26 @@ cat >conftest.$ac_ext <<_ACEOF #define pututline _pututline #endif -int -main () -{ +int main() { int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4099: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4102: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4105: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4108: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define GETUTENT 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -olibs="$LIBS" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + olibs="$LIBS" LIBS="$LIBS -lgen" -{ echo "$as_me:4119: checking getutent with -lgen..." >&5 -echo "$as_me: checking getutent with -lgen..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4122 "configure" +echo "checking getutent with -lgen" 1>&6 +echo "configure:2692: checking getutent with -lgen" >&5 +cat > conftest.$ac_ext <<EOF +#line 2694 "configure" #include "confdefs.h" #include <time.h> @@ -4134,43 +2705,30 @@ cat >conftest.$ac_ext <<_ACEOF #define pututline _pututline #endif -int -main () -{ +int main() { int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4146: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4149: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4152: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4155: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define GETUTENT 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$olibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$olibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -{ echo "$as_me:4170: checking ut_host..." >&5 -echo "$as_me: checking ut_host..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4173 "configure" +rm -f conftest* +echo "checking ut_host" 1>&6 +echo "configure:2730: checking ut_host" >&5 +cat > conftest.$ac_ext <<EOF +#line 2732 "configure" #include "confdefs.h" #include <time.h> @@ -4182,187 +2740,139 @@ cat >conftest.$ac_ext <<_ACEOF #include <utmp.h> #endif -int -main () -{ +int main() { struct utmp u; u.ut_host[0] = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4194: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4197: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4200: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4203: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define UTHOST 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:4214: checking for utempter.h" >&5 -echo $ECHO_N "checking for utempter.h... $ECHO_C" >&6 -if test "${ac_cv_header_utempter_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4220 "configure" +rm -f conftest* +ac_safe=`echo "utempter.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for utempter.h""... $ac_c" 1>&6 +echo "configure:2761: checking for utempter.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 2766 "configure" #include "confdefs.h" #include <utempter.h> -_ACEOF -if { (eval echo "$as_me:4224: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:4230: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_utempter_h=yes -else - echo "$as_me: failed program was:" >&5 +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2771: \"$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 - ac_cv_header_utempter_h=no + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4249: result: $ac_cv_header_utempter_h" >&5 -echo "${ECHO_T}$ac_cv_header_utempter_h" >&6 -if test $ac_cv_header_utempter_h = yes; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 have_utempter=yes else - have_utempter=no + echo "$ac_t""no" 1>&6 +have_utempter=no fi if test "$have_utempter" = yes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_UTEMPTER 1 EOF LIBS="$LIBS -lutempter" fi -{ echo "$as_me:4265: checking for libutil(s)..." >&5 -echo "$as_me: checking for libutil(s)..." >&6;} +echo "checking for libutil(s)" 1>&6 +echo "configure:2802: checking for libutil(s)" >&5 test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils" test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" -{ echo "$as_me:4270: checking getloadavg..." >&5 -echo "$as_me: checking getloadavg..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4273 "configure" +echo "checking getloadavg" 1>&6 +echo "configure:2807: checking getloadavg" >&5 +cat > conftest.$ac_ext <<EOF +#line 2809 "configure" #include "confdefs.h" -int -main () -{ +int main() { getloadavg((double *)0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4285: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4288: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4291: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4294: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define LOADAV_GETLOADAVG 1 EOF load=1 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -if test -f /usr/lib/libkvm.a ; then + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + if test -f /usr/lib/libkvm.a ; then olibs="$LIBS" LIBS="$LIBS -lkvm" -{ echo "$as_me:4306: checking getloadavg with -lkvm..." >&5 -echo "$as_me: checking getloadavg with -lkvm..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4309 "configure" +echo "checking getloadavg with -lkvm" 1>&6 +echo "configure:2830: checking getloadavg with -lkvm" >&5 +cat > conftest.$ac_ext <<EOF +#line 2832 "configure" #include "confdefs.h" -int -main () -{ +int main() { getloadavg((double *)0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4321: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4324: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4327: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4330: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define LOADAV_GETLOADAVG 1 EOF load=1 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$olibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$olibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* if test -z "$load" ; then -cat >conftest.$ac_ext <<_ACEOF -#line 4349 "configure" +cat > conftest.$ac_ext <<EOF +#line 2859 "configure" #include "confdefs.h" #if defined(NeXT) || defined(apollo) || defined(linux) yes; #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* load=1 fi rm -f conftest* fi if test -z "$load" ; then -{ echo "$as_me:4364: checking for kernelfile..." >&5 -echo "$as_me: checking for kernelfile..." >&6;} +echo "checking for kernelfile" 1>&6 +echo "configure:2876: checking for kernelfile" >&5 for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do if test -f $core || test -c $core; then break @@ -4375,93 +2885,72 @@ else echo "- using kernelfile '$core'" 1>&6 if test -r $core ; then - cat >>confdefs.h <<EOF + cat >> confdefs.h <<EOF #define LOADAV_UNIX "$core" EOF - echo "$as_me:4382: checking for nlist.h" >&5 -echo $ECHO_N "checking for nlist.h... $ECHO_C" >&6 -if test "${ac_cv_header_nlist_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 +echo "configure:2895: 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 <<_ACEOF -#line 4388 "configure" + cat > conftest.$ac_ext <<EOF +#line 2900 "configure" #include "confdefs.h" #include <nlist.h> -_ACEOF -if { (eval echo "$as_me:4392: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:4398: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_nlist_h=yes -else - echo "$as_me: failed program was:" >&5 +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2905: \"$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 - ac_cv_header_nlist_h=no + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:4417: result: $ac_cv_header_nlist_h" >&5 -echo "${ECHO_T}$ac_cv_header_nlist_h" >&6 -if test $ac_cv_header_nlist_h = yes; then - cat >>confdefs.h <<\EOF +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 "$as_me:4424: checking n_un in struct nlist..." >&5 -echo "$as_me: checking n_un in struct nlist..." >&6;} - cat >conftest.$ac_ext <<_ACEOF -#line 4427 "configure" + echo "checking n_un in struct nlist" 1>&6 +echo "configure:2926: checking n_un in struct nlist" >&5 + cat > conftest.$ac_ext <<EOF +#line 2928 "configure" #include "confdefs.h" #include <nlist.h> -int -main () -{ +int main() { struct nlist n; n.n_un.n_name = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4439: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4442: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4445: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4448: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:2935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define NLIST_NAME_UNION 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* +else + echo "$ac_t""no" 1>&6 fi - { echo "$as_me:4461: checking for nlist declaration..." >&5 -echo "$as_me: checking for nlist declaration..." >&6;} - cat >conftest.$ac_ext <<_ACEOF -#line 4464 "configure" + + echo "checking for nlist declaration" 1>&6 +echo "configure:2952: checking for nlist declaration" >&5 + cat > conftest.$ac_ext <<EOF +#line 2954 "configure" #include "confdefs.h" #ifdef NLIST_STRUCT @@ -4470,27 +2959,27 @@ echo "$as_me: checking for nlist declaration..." >&6;} # include <a.out.h> #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "nlist(( | )( | )*.*\(|\()" >/dev/null 2>&1; then - cat >>confdefs.h <<\EOF + rm -rf conftest* + cat >> confdefs.h <<\EOF #define NLIST_DECLARED 1 EOF fi rm -f conftest* - { echo "$as_me:4483: checking for avenrun symbol..." >&5 -echo "$as_me: checking for avenrun symbol..." >&6;} + + echo "checking for avenrun symbol" 1>&6 +echo "configure:2976: checking for avenrun symbol" >&5 nlist64= for av in avenrun _avenrun _Loadavg avenrun _avenrun _Loadavg; do if test "$cross_compiling" = yes; then - { { echo "$as_me:4488: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 4493 "configure" + cat > conftest.$ac_ext <<EOF +#line 2983 "configure" #include "confdefs.h" #include <sys/types.h> @@ -4520,27 +3009,18 @@ main() exit(1); exit(0); } - -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:4526: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4529: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4531: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4534: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + +EOF +if { (eval echo configure:3015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then avensym=$av;break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + if test "$av" = _Loadavg; then nlist64='#define nlist nlist64' fi @@ -4551,14 +3031,14 @@ fi else echo "- using avenrun symbol '$avensym'" 1>&6 - cat >>confdefs.h <<EOF + cat >> confdefs.h <<EOF #define LOADAV_AVENRUN "$avensym" EOF if test -n "$nlist64"; then echo "- used nlist64 to find it" 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define LOADAV_USE_NLIST64 1 EOF @@ -4628,19 +3108,20 @@ eval "$ac_cpp conftest.c 2>&5 | sed -e '1,/_CUT_HERE_/d' -e 's/ //g' > conftest. . ./conftest.out rm -f conftest* -if test -n "$load" ; then cat >>confdefs.h <<\EOF + +if test -n "$load" ; then cat >> confdefs.h <<\EOF #define LOADAV 1 EOF fi -if test -n "$loadtype" ; then cat >>confdefs.h <<EOF +if test -n "$loadtype" ; then cat >> confdefs.h <<EOF #define LOADAV_TYPE $loadtype EOF fi -if test -n "$loadnum" ; then cat >>confdefs.h <<EOF +if test -n "$loadnum" ; then cat >> confdefs.h <<EOF #define LOADAV_NUM $loadnum EOF fi -if test -n "$loadscale" ; then cat >>confdefs.h <<EOF +if test -n "$loadscale" ; then cat >> confdefs.h <<EOF #define LOADAV_SCALE $loadscale EOF fi @@ -4649,16 +3130,17 @@ if test -n "$posix" ; then echo "assuming posix signal definition" 1>&6 -cat >>confdefs.h <<\EOF +cat >> confdefs.h <<\EOF #define SIGVOID 1 EOF + else -{ echo "$as_me:4658: checking return type of signal handlers..." >&5 -echo "$as_me: checking return type of signal handlers..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4661 "configure" +echo "checking return type of signal handlers" 1>&6 +echo "configure:3142: checking return type of signal handlers" >&5 +cat > conftest.$ac_ext <<EOF +#line 3144 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -4666,47 +3148,31 @@ cat >conftest.$ac_ext <<_ACEOF #undef signal #endif extern void (*signal ()) (); -int -main () -{ +int main() { int i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4678: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4681: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4684: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4687: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define SIGVOID 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:4698: checking sigset..." >&5 -echo "$as_me: checking sigset..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4701 "configure" +rm -f conftest* +echo "checking sigset" 1>&6 +echo "configure:3168: checking sigset" >&5 +cat > conftest.$ac_ext <<EOF +#line 3170 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> -int -main () -{ +int main() { #ifdef SIGVOID sigset(0, (void (*)())0); @@ -4714,40 +3180,26 @@ sigset(0, (void (*)())0); sigset(0, (int (*)())0); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4722: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4725: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4728: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4731: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define USESIGSET 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -{ echo "$as_me:4742: checking signal implementation..." >&5 -echo "$as_me: checking signal implementation..." >&6;} +rm -f conftest* +echo "checking signal implementation" 1>&6 +echo "configure:3198: checking signal implementation" >&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:4745: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 4750 "configure" + cat > conftest.$ac_ext <<EOF +#line 3203 "configure" #include "confdefs.h" #include <sys/types.h> @@ -4783,208 +3235,146 @@ main() exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:4788: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4791: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4793: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4796: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >>confdefs.h <<\EOF + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + cat >> confdefs.h <<\EOF #define SYSVSIGS 1 EOF fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + fi -{ echo "$as_me:4813: checking for crypt and sec libraries..." >&5 -echo "$as_me: checking for crypt and sec libraries..." >&6;} + +echo "checking for crypt and sec libraries" 1>&6 +echo "configure:3260: checking for crypt and sec libraries" >&5 test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d" oldlibs="$LIBS" LIBS="$LIBS -lcrypt" -{ echo "$as_me:4818: checking crypt..." >&5 -echo "$as_me: checking crypt..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4821 "configure" +echo "checking crypt" 1>&6 +echo "configure:3265: checking crypt" >&5 +cat > conftest.$ac_ext <<EOF +#line 3267 "configure" #include "confdefs.h" -int -main () -{ +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4833: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4836: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4839: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4842: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$oldlibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$oldlibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" oldlibs="$LIBS" LIBS="$LIBS -lsun" -{ echo "$as_me:4855: checking IRIX sun library..." >&5 -echo "$as_me: checking IRIX sun library..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4858 "configure" +echo "checking IRIX sun library" 1>&6 +echo "configure:3288: checking IRIX sun library" >&5 +cat > conftest.$ac_ext <<EOF +#line 3290 "configure" #include "confdefs.h" -int -main () -{ +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4870: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4873: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4876: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4879: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$oldlibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$oldlibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:4889: checking syslog..." >&5 -echo "$as_me: checking syslog..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4892 "configure" +echo "checking syslog" 1>&6 +echo "configure:3308: checking syslog" >&5 +cat > conftest.$ac_ext <<EOF +#line 3310 "configure" #include "confdefs.h" -int -main () -{ +int main() { closelog(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4904: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4907: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4910: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4913: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -oldlibs="$LIBS" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + oldlibs="$LIBS" LIBS="$LIBS -lbsd" -{ echo "$as_me:4921: checking syslog in libbsd.a..." >&5 -echo "$as_me: checking syslog in libbsd.a..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4924 "configure" +echo "checking syslog in libbsd.a" 1>&6 +echo "configure:3326: checking syslog in libbsd.a" >&5 +cat > conftest.$ac_ext <<EOF +#line 3328 "configure" #include "confdefs.h" -int -main () -{ +int main() { closelog(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4936: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4939: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4942: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4945: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:3335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* echo "- found." 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS="$oldlibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$oldlibs" echo "- bad news: syslog missing." 1>&6 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define NOSYSLOG 1 EOF fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -cat >conftest.$ac_ext <<_ACEOF -#line 4964 "configure" +cat > conftest.$ac_ext <<EOF +#line 3355 "configure" #include "confdefs.h" #ifdef M_UNIX yes; #endif -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* LIBS="$LIBS -lsocket -lcrypt_i" fi rm -f conftest* -{ echo "$as_me:4977: checking wait union..." >&5 -echo "$as_me: checking wait union..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 4980 "configure" + +echo "checking wait union" 1>&6 +echo "configure:3371: checking wait union" >&5 +cat > conftest.$ac_ext <<EOF +#line 3373 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> -int -main () -{ +int main() { union wait x; int y; @@ -4992,184 +3382,120 @@ main () y = WEXITSTATUS(x); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5000: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:5003: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5006: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5009: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define BSDWAIT 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* if test -z "$butterfly"; then -{ echo "$as_me:5022: checking for termio or termios..." >&5 -echo "$as_me: checking for termio or termios..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 5025 "configure" +echo "checking for termio or termios" 1>&6 +echo "configure:3402: checking for termio or termios" >&5 +cat > conftest.$ac_ext <<EOF +#line 3404 "configure" #include "confdefs.h" #include <termio.h> -_ACEOF -if { (eval echo "$as_me:5029: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:5035: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - cat >>confdefs.h <<\EOF +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3409: \"$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* + cat >> confdefs.h <<\EOF #define TERMIO 1 EOF else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* if test -n "$posix"; then -cat >conftest.$ac_ext <<_ACEOF -#line 5055 "configure" +cat > conftest.$ac_ext <<EOF +#line 3424 "configure" #include "confdefs.h" #include <termios.h> -_ACEOF -if { (eval echo "$as_me:5059: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:5065: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - cat >>confdefs.h <<\EOF +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3429: \"$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* + cat >> confdefs.h <<\EOF #define TERMIO 1 EOF else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -{ echo "$as_me:5092: checking getspnam..." >&5 -echo "$as_me: checking getspnam..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 5095 "configure" +echo "checking getspnam" 1>&6 +echo "configure:3450: checking getspnam" >&5 +cat > conftest.$ac_ext <<EOF +#line 3452 "configure" #include "confdefs.h" #include <shadow.h> -int -main () -{ +int main() { getspnam("x"); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5107: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5110: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5113: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5116: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define SHADOWPW 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:5128: checking getttyent..." >&5 -echo "$as_me: checking getttyent..." >&6;} -cat >conftest.$ac_ext <<_ACEOF -#line 5131 "configure" +echo "checking getttyent" 1>&6 +echo "configure:3472: checking getttyent" >&5 +cat > conftest.$ac_ext <<EOF +#line 3474 "configure" #include "confdefs.h" -int -main () -{ +int main() { getttyent(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5143: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5146: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5149: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5152: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF #define GETTTYENT 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* -{ echo "$as_me:5164: checking whether memcpy/memmove/bcopy handles overlapping arguments..." >&5 -echo "$as_me: checking whether memcpy/memmove/bcopy handles overlapping arguments..." >&6;} +echo "checking whether memcpy/memmove/bcopy handles overlapping arguments" 1>&6 +echo "configure:3494: checking whether memcpy/memmove/bcopy handles overlapping arguments" >&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:5167: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 5172 "configure" + cat > conftest.$ac_ext <<EOF +#line 3499 "configure" #include "confdefs.h" main() { @@ -5184,37 +3510,26 @@ main() { exit(1); exit(0); /* libc version works properly. */ } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5189: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5192: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5194: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5197: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +EOF +if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + cat >> confdefs.h <<\EOF #define USEBCOPY 1 EOF else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + if test "$cross_compiling" = yes; then - { { echo "$as_me:5212: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 5217 "configure" + cat > conftest.$ac_ext <<EOF +#line 3533 "configure" #include "confdefs.h" #define bcopy(s,d,l) memmove(d,s,l) @@ -5230,37 +3545,27 @@ main() { exit(1); exit(0); /* libc version works properly. */ } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5235: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5238: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5240: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5243: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +EOF +if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + cat >> confdefs.h <<\EOF #define USEMEMMOVE 1 EOF else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + + if test "$cross_compiling" = yes; then - { { echo "$as_me:5258: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 5263 "configure" + cat > conftest.$ac_ext <<EOF +#line 3569 "configure" #include "confdefs.h" #define bcopy(s,d,l) memcpy(d,s,l) @@ -5276,497 +3581,362 @@ main() { exit(1); exit(0); /* libc version works properly. */ } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5281: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5284: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5286: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5289: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +EOF +if { (eval echo configure:3586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + cat >> confdefs.h <<\EOF #define USEMEMCPY 1 EOF else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi -echo "$as_me:5303: checking long file names" >&5 -echo $ECHO_N "checking long file names... $ECHO_C" >&6 + +echo $ac_n "checking long file names""... $ac_c" 1>&6 +echo "configure:3601: checking long file names" >&5 (echo 1 > /tmp/conftest9012345) 2>/dev/null (echo 2 > /tmp/conftest9012346) 2>/dev/null val=`cat /tmp/conftest9012345 2>/dev/null` if test -f /tmp/conftest9012345 && test "$val" = 1; then -echo "$as_me:5309: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +echo "$ac_t""yes" 1>&6 else -echo "$as_me:5312: result: no" >&5 -echo "${ECHO_T}no" >&6 -cat >>confdefs.h <<\EOF +echo "$ac_t""no" 1>&6 +cat >> confdefs.h <<\EOF #define NAME_MAX 14 EOF fi rm -f /tmp/conftest* -echo "$as_me:5321: checking for vsprintf" >&5 -echo $ECHO_N "checking for vsprintf... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5324 "configure" +echo $ac_n "checking for vsprintf""... $ac_c" 1>&6 +echo "configure:3617: checking for vsprintf" >&5 +cat > conftest.$ac_ext <<EOF +#line 3619 "configure" #include "confdefs.h" -int -main () -{ +int main() { vsprintf(0,0,0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5336: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5339: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5342: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5345: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5347: result: yes" >&5 -echo "${ECHO_T}yes" >&6;cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define USEVARARGS 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5355: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:5363: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5369 "configure" +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +echo "configure:3645: checking for $ac_hdr that defines DIR" >&5 +if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 3650 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> - -int -main () -{ -if ((DIR *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5384: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:5387: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5390: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5393: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" +int main() { +DIR *dirp = 0; +; return 0; } +EOF +if { (eval echo configure:3658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:5403: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<EOF -#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +if eval "test \"`echo '$ac_cv_header_dirent_'$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 - -ac_header_dirent=$ac_hdr; break + ac_header_dirent=$ac_hdr; break +else + echo "$ac_t""no" 1>&6 fi - done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:5416: checking for opendir in -ldir" >&5 -echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 -if test "${ac_cv_lib_dir_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +echo "configure:3683: checking for opendir in -ldir" >&5 +ac_lib_var=`echo dir'_'opendir | 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5424 "configure" +cat > conftest.$ac_ext <<EOF +#line 3691 "configure" #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5443: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5446: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5449: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5452: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dir_opendir=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5463: result: $ac_cv_lib_dir_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then + builtin and then its argument prototype would still apply. */ +char opendir(); + +int main() { +opendir() +; return 0; } +EOF +if { (eval echo configure:3702: \"$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="$LIBS -ldir" +else + echo "$ac_t""no" 1>&6 fi else - echo "$as_me:5470: checking for opendir in -lx" >&5 -echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 -if test "${ac_cv_lib_x_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +echo "configure:3724: checking for opendir in -lx" >&5 +ac_lib_var=`echo x'_'opendir | 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5478 "configure" +cat > conftest.$ac_ext <<EOF +#line 3732 "configure" #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5497: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5500: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5503: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5506: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_x_opendir=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5517: result: $ac_cv_lib_x_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then + builtin and then its argument prototype would still apply. */ +char opendir(); + +int main() { +opendir() +; return 0; } +EOF +if { (eval echo configure:3743: \"$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="$LIBS -lx" +else + echo "$ac_t""no" 1>&6 fi fi -echo "$as_me:5525: checking for setenv" >&5 -echo $ECHO_N "checking for setenv... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5528 "configure" + +echo $ac_n "checking for setenv""... $ac_c" 1>&6 +echo "configure:3767: checking for setenv" >&5 +cat > conftest.$ac_ext <<EOF +#line 3769 "configure" #include "confdefs.h" -int -main () -{ +int main() { setenv((char *)0,(char *)0);unsetenv((char *)0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5540: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5543: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5546: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5549: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5551: result: yes" >&5 -echo "${ECHO_T}yes" >&6;cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define USESETENV 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5559: result: no" >&5 -echo "${ECHO_T}no" >&6 -echo "$as_me:5561: checking for putenv" >&5 -echo $ECHO_N "checking for putenv... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5564 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for putenv""... $ac_c" 1>&6 +echo "configure:3788: checking for putenv" >&5 +cat > conftest.$ac_ext <<EOF +#line 3790 "configure" #include "confdefs.h" -int -main () -{ +int main() { putenv((char *)0);unsetenv((char *)0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5576: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5579: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5582: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5585: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5587: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5592: result: no" >&5 -echo "${ECHO_T}no" >&6;cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6;cat >> confdefs.h <<\EOF #define NEEDPUTENV 1 EOF + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:5601: checking for nl_langinfo(CODESET)" >&5 -echo $ECHO_N "checking for nl_langinfo(CODESET)... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5604 "configure" +rm -f conftest* +echo $ac_n "checking for nl_langinfo(CODESET)""... $ac_c" 1>&6 +echo "configure:3814: checking for nl_langinfo(CODESET)" >&5 +cat > conftest.$ac_ext <<EOF +#line 3816 "configure" #include "confdefs.h" #include <langinfo.h> -int -main () -{ +int main() { nl_langinfo(CODESET); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5618: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5621: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5624: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5627: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5629: result: yes" >&5 -echo "${ECHO_T}yes" >&6;cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:3825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_NL_LANGINFO 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5637: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* for ac_func in rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5645: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5651 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3842: 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 3847 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ + which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* 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 (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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 -f = $ac_func; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5682: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5685: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5688: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5691: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:5701: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<EOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +; return 0; } EOF +if { (eval echo configure:3870: \"$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 fi done + # Check whether --enable-pam or --disable-pam was given. if test "${enable_pam+set}" = set; then enableval="$enable_pam" + : +fi -fi; if test "$enable_pam" = "yes"; then - echo "$as_me:5717: checking for PAM support" >&5 -echo $ECHO_N "checking for PAM support... $ECHO_C" >&6 + echo $ac_n "checking for PAM support""... $ac_c" 1>&6 +echo "configure:3903: checking for PAM support" >&5 oldlibs="$LIBS" LIBS="$LIBS -lpam" - cat >conftest.$ac_ext <<_ACEOF -#line 5722 "configure" + cat > conftest.$ac_ext <<EOF +#line 3907 "configure" #include "confdefs.h" #include <security/pam_appl.h> -int -main () -{ +int main() { pam_start(0, 0, 0, 0); pam_authenticate(0, 0); pam_end(0,0); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5738: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5741: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5744: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5747: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5749: result: yes" >&5 -echo "${ECHO_T}yes" >&6;cat >>confdefs.h <<\EOF + +; return 0; } +EOF +if { (eval echo configure:3918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define USE_PAM 1 EOF else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5757: result: no" >&5 -echo "${ECHO_T}no" >&6;LIBS="$oldlibs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6;LIBS="$oldlibs" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi # Check whether --enable-use_locale or --disable-use_locale was given. if test "${enable_use_locale+set}" = set; then enableval="$enable_use_locale" + : +fi -fi; if test "$enable_use_locale" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define USE_LOCALE 1 EOF @@ -5774,10 +3944,11 @@ fi # Check whether --enable-telnet or --disable-telnet was given. if test "${enable_telnet+set}" = set; then enableval="$enable_telnet" + : +fi -fi; if test "$enable_telnet" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define BUILTIN_TELNET 1 EOF @@ -5785,10 +3956,11 @@ fi # Check whether --enable-colors256 or --disable-colors256 was given. if test "${enable_colors256+set}" = set; then enableval="$enable_colors256" + : +fi -fi; if test "$enable_colors256" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define COLORS256 1 EOF @@ -5796,10 +3968,11 @@ fi # Check whether --enable-rxvt_osc or --disable-rxvt_osc was given. if test "${enable_rxvt_osc+set}" = set; then enableval="$enable_rxvt_osc" + : +fi -fi; if test "$enable_rxvt_osc" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define RXVT_OSC 1 EOF @@ -5813,917 +3986,425 @@ fi test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" if test "$cross_compiling" = yes; then - { { echo "$as_me:5816: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else - cat >conftest.$ac_ext <<_ACEOF -#line 5821 "configure" + cat > conftest.$ac_ext <<EOF +#line 3993 "configure" #include "confdefs.h" main(){exit(0);} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5826: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5829: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5831: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5834: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:5841: error: Can't run the compiler - internal error. Sorry." >&5 -echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;} - { (exit 1); exit 1; }; } + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + { echo "configure: error: Can't run the compiler - internal error. Sorry." 1>&2; exit 1; } fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -fr conftest* fi + ETCSCREENRC="\"/usr/local/etc/screenrc\"" if test -n "$prefix"; then ETCSCREENRC="\"$prefix/etc/screenrc\"" fi -echo "$as_me:5852: checking for the global screenrc file" >&5 -echo $ECHO_N "checking for the global screenrc file... $ECHO_C" >&6 - +echo $ac_n "checking for the global screenrc file""... $ac_c" 1>&6 +echo "configure:4015: checking for the global screenrc file" >&5 # Check whether --with-sys-screenrc or --without-sys-screenrc was given. if test "${with_sys_screenrc+set}" = set; then withval="$with_sys_screenrc" - ETCSCREENRC="\"${withval}\"" -fi; -cat >>confdefs.h <<EOF + ETCSCREENRC="\"${withval}\"" +fi + +cat >> confdefs.h <<EOF #define ETCSCREENRC $ETCSCREENRC EOF -echo "$as_me:5864: result: $ETCSCREENRC" >&5 -echo "${ECHO_T}$ETCSCREENRC" >&6 +echo "$ac_t""$ETCSCREENRC" 1>&6 SCREENENCODINGS="\"/usr/local/lib/screen/utf8encodings\"" if test -n "$datadir"; then eval SCREENENCODINGS="$datadir/screen/utf8encodings" SCREENENCODINGS="\"$SCREENENCODINGS\"" fi -echo "$as_me:5872: checking for the utf8-encodings location" >&5 -echo $ECHO_N "checking for the utf8-encodings location... $ECHO_C" >&6 -cat >>confdefs.h <<EOF +echo $ac_n "checking for the utf8-encodings location""... $ac_c" 1>&6 +echo "configure:4034: checking for the utf8-encodings location" >&5 +cat >> confdefs.h <<EOF #define SCREENENCODINGS $SCREENENCODINGS EOF -echo "$as_me:5878: result: $SCREENENCODINGS" >&5 -echo "${ECHO_T}$SCREENENCODINGS" >&6 +echo "$ac_t""$SCREENENCODINGS" 1>&6 -ac_config_files="$ac_config_files Makefile doc/Makefile" -ac_config_commands="$ac_config_commands default" -cat >confcache <<\_ACEOF +trap '' 1 2 15 +cat > confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. # -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - +EOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file + echo "updating cache $cache_file" + cat confcache > $cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' fi +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + DEFS=-DHAVE_CONFIG_H +# Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:5962: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS <<EOF +#! /bin/sh # Generated automatically by configure. # Run this file to recreate the current configuration. +# This directory was configured as follows, +# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# +# $0 $ac_configure_args +# # Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" +# configure, is in ./config.log if it exists. -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } - -exec 6>&1 - -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\EOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to <bug-autoconf@gnu.org>." -EOF - -cat >>$CONFIG_STATUS <<EOF -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.52, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" -EOF - -cat >>$CONFIG_STATUS <<\EOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift - ;; - -*);; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_need_defaults=false;; - esac - - case $1 in - # Handling of the options. -EOF -cat >>$CONFIG_STATUS <<EOF + case "\$ac_option" in -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:6138: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" - ac_need_defaults=false;; - - # This is an error. - -*) { { echo "$as_me:6157: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; esac - shift done -exec 5>>config.log -cat >&5 << _ACEOF - -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` - -_ACEOF +trap 'rm -fr `echo "Makefile doc/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF +cat >> $CONFIG_STATUS <<EOF -cat >>$CONFIG_STATUS <<\EOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:6196: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} -{ - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } -} - -EOF - -cat >>$CONFIG_STATUS <<EOF - -# -# CONFIG_FILES section. -# +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@SHELL@%$SHELL%g +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@VERSION@%$VERSION%g +s%@SCREEN@%$SCREEN%g +s%@GZIP@%$GZIP%g +s%@CC@%$CC%g +s%@CPP@%$CPP%g +s%@AWK@%$AWK%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@WRITEPATH@%$WRITEPATH%g +s%@XTERMPATH@%$XTERMPATH%g -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t -s,@LIBS@,$LIBS,;t t -s,@VERSION@,$VERSION,;t t -s,@SCREEN@,$SCREEN,;t t -s,@GZIP@,$GZIP,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@CPP@,$CPP,;t t -s,@AWK@,$AWK,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@WRITEPATH@,$WRITEPATH,;t t -s,@XTERMPATH@,$XTERMPATH,;t t CEOF - EOF - cat >>$CONFIG_STATUS <<\EOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` fi -fi # test -n "$CONFIG_FILES" +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF +cat >> $CONFIG_STATUS <<EOF + +CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile"} EOF -cat >>$CONFIG_STATUS <<\EOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +cat >> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` else ac_dir_suffix= ac_dots= fi - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:6409: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:6427: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:6440: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <<EOF - sed "$ac_vpsub -$extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -EOF -cat >>$CONFIG_STATUS <<\EOF + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac -# -# CONFIG_HEADER section. -# + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dC='\3' +ac_dD='%g' +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='\([ ]\)%\1#\2define\3' ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +ac_uD='\4%g' +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eB='$%\1#\2define\3' +ac_eC=' ' +ac_eD='%g' + +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <<EOF + CONFIG_HEADERS="config.h" +EOF +cat >> $CONFIG_STATUS <<\EOF +fi +for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; esac - test x"$ac_file" != x- && { echo "$as_me:6501: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:6512: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:6525: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -EOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -EOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in + +EOF + +# Transform confdefs.h into a sed script conftest.vals that substitutes +# the proper values into config.h.in to produce config.h. And first: +# Protect against being on the right side of a sed subst in config.status. +# Protect against being in an unquoted here document in config.status. +rm -f conftest.vals +cat > conftest.hdr <<\EOF +s/[\\&%]/\\&/g +s%[\\$`]%\\&%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%ac_d%ac_u%gp +s%ac_u%ac_e%gp +EOF +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\EOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% EOF -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS rm -f conftest.tail -while grep . conftest.undefs >/dev/null +while : do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\EOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h +rm -f conftest.vals + +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + echo "$ac_file is unchanged" + rm -f conftest.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:6642: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - fi - rm -f $ac_file - mv $tmp/config.h $ac_file + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" fi - else - cat $tmp/config.h - rm -f $tmp/config.h + rm -f $ac_file + mv conftest.h $ac_file fi -done +fi; done + EOF -cat >>$CONFIG_STATUS <<\EOF +cat >> $CONFIG_STATUS <<EOF -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` +EOF +cat >> $CONFIG_STATUS <<\EOF - case $ac_dest in - default ) # a hook for preserving undef directive in config.h mv config.h conftest sed -e 's@^\(.*\)defin.\( .*\) .*/\*\(.*KEEP_UNDEF_HERE\)@\1undef\2 /\*\3@' < conftest > config.h rm -f conftest - ;; - esac -done -EOF -cat >>$CONFIG_STATUS <<\EOF - -{ (exit 0); exit 0; } +exit 0 EOF chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + echo "" if test -z "$AWK"; then diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..e6c9f1b --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,53 @@ +$Id: README.Debian,v 1.5 2002/03/20 22:19:41 laz Exp $ + +Screen Information +------------------ +See the copyright file for information about where to get screen, licensing, +and other assorted information. + + +Debian Modifications +-------------------- + * added Debian package maintenance files + * Use /var/run/screen instead of /tmp/screens + * Make it set-gid "utmp" instead of setuid root + + +Debian Screen Q&A +----------------- + +Q: Screen sets my xterm titlebar. I don't like this, how do I make it stop? + +A: The titlebar setting is set in the /etc/screenrc by telling screen that some + of the GUI terminals have a hardstatus line and that it can be set by + sending the xterm escape sequences that set the title/icon. + + # Set the hardstatus prop on gui terms to set the titlebar/icon title + termcapinfo xterm*|rxvt*|kterm*|Eterm* hs:ts=\E]0;:fs=\007:ds=\E]0;\007 + + You can override this on a system wide basis by commenting out this line in + the /etc/screenrc or you can override it in your personal screenrc by adding + the following line: + + termcapinfo xterm*|rxvt*|kterm*|Eterm* hs@ + + +Q: Why do I get #!$@#$@!% trailing spaces when I cut and paste from mutt + running within screen? +Q: Why does the statusbar in my irc client extend to the end of the screen + in xterm but not in screen? + +A: This has to do with handling of the bce terminal attribute, or lack + thereof by default in screen. You can enable bce on a per-user by adding the + following to your .screenrc: + + defbce on + term screen-bce + + NOTE: if you do this your TERM will be screen-bce. When you login to + other machines they may not have a screen-bce terminal type, so you + will see errors. To fix this you must put the terminfo for screen-bce + on that remote machine. The screen terminfo is found in + /usr/share/doc/screen/terminfo/screeninfo.src and you can compile it + on the remote machine using tic(1). + diff --git a/debian/README.terminfo b/debian/README.terminfo new file mode 100644 index 0000000..d576c36 --- /dev/null +++ b/debian/README.terminfo @@ -0,0 +1,5 @@ +Debian uses ncurses/terminfo, not curses/termcap, so you really shouldn't need +the screencap file in this directory. + +The screeninfo.src file is installed by the `ncurses-term' package +-- it's here for reference, and to recover from stupid errors (like?). diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..75d81eb --- /dev/null +++ b/debian/changelog @@ -0,0 +1,388 @@ +screen (3.9.11-5woody1) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Applied patch by Timo Sirainen <tss@iki.fi> to fix buffer integer + overflow (CAN-2003-0972) + + -- Martin Schulze <joey@infodrom.org> Sun, 21 Dec 2003 19:46:24 +0100 + +screen (3.9.11-5) unstable; urgency=high + + * remove (%n.%t) from hardstatus string (closes: #137095) + * bump up max window title length to 60 (closes: #135391) + * debconf templates: + * add french translation (thanks Philippe Batailler) (closes: #141676) + * add russian translation (thanks Ilgiz Kalmetev) (closes: #137682) + * split translations out into their own files + * fix debconf prompt when upgrading from versions < 3.9.5-5 (closes: #137743) + * edit the long description a bit + * update README.Debian as to current state of screen-bce + + -- Adam Lazur <zal@debian.org> Wed, 10 Apr 2002 22:01:46 -0400 + +screen (3.9.11-4) unstable; urgency=low + + * patches to fix Japanese support: + screen-3.9.11.hcGR-patch + screen-3.9.11.paste-patch + screen-3.9.11.encoding-patch (closes: #136740) + * add spanish debconf template translation (closes: #136447) + + -- Adam Lazur <zal@debian.org> Thu, 7 Mar 2002 09:13:56 -0500 + +screen (3.9.11-3) unstable; urgency=high + + * Security Fix: override autoconf detected default group and mode on ptys + as it is not autodetected properly for buildd's that run + as cronjobs (closes: #135018) + * add note to README.Debian about setting xterm titlebar/icon and how to + override the default + * add note to README.Debian about mutt padding lines with whitespace (bce) + * add patchlevel.h (the real upstream changelog) to /usr/share/doc/screen + + -- Adam Lazur <zal@debian.org> Thu, 21 Feb 2002 17:25:12 -0500 + +screen (3.9.11-2) unstable; urgency=high + + * Apply patch to fix non utf8 locales (closes: #134200) + * fix problems with screenrc changes that affected konsole (closes: #134198) + * remove line that was borking TERM=xterm + * re-add line which mods xterm initialization string + * Add screen-bce terminal type to screeninfo.src and add a note about it in + README.Debian + + -- Adam Lazur <zal@debian.org> Sat, 16 Feb 2002 13:49:38 -0500 + +screen (3.9.11-1) unstable; urgency=low + + * New upstream release + * New commands: windowlist (bound to C-a "), source, eval, ignorecase, + deflogin, setsid + * Support for double-width utf-8 characters. + * bugfixes and other features, see /usr/share/doc/screen/NEWS.gz for more + info + + * Removed patches: + * pam support, hurd fix, getpt fix: accepted upstream + * md5 password support: obsoleted by pam support + * bufferfile default change: screen is tmpfile safe + + * Updates to /etc/screenrc: + * Bump up defscrollback from 100 (compiled in default) to 1024 + (thanks to overfiend for pointing this out) + * Add examples of running programs at screen startup + + * Add german template translation (closes: #126180) + * Now (ab)use upstream's makefile for most of the file installation + * compile with --enable-rxvt_osc to allow rxvt icon setting from within + screen (closes: #133333) + + -- Adam Lazur <zal@debian.org> Fri, 15 Feb 2002 10:18:07 -0500 + +screen (3.9.10-1) unstable; urgency=low + + * New Maintainer + * migrate package build to debhelper + * debconfify prompt when upgrading from screen < 3.9.5-5 + + -- Adam Lazur <zal@debian.org> Sat, 15 Dec 2001 21:20:58 -0500 + +screen (3.9.10-0.1) unstable; urgency=high + + * NMU. + * New upstream version with security fix. (Closes: #111339) + (Thanks Adam Lazur <laz@clustermonkey.org>) + + -- Eric Gillespie, Jr. <epg@debian.org> Wed, 12 Sep 2001 22:11:23 -0500 + +screen (3.9.9-2) unstable; urgency=low + + * New Standards-Version (3.5.4) + * Get rid of suidmanager, install screen setgid (closes: Bug#96858) + + -- Juan Cespedes <cespedes@debian.org> Tue, 5 Jun 2001 23:50:42 +0200 + +screen (3.9.9-1) unstable; urgency=low + + * New upstream version + * Really fix Bug#80337 (thanks to Michael Schroeder <mls@suse.de>) + + -- Juan Cespedes <cespedes@debian.org> Sat, 2 Jun 2001 19:40:37 +0200 + +screen (3.9.8-6.1) unstable; urgency=HIGH + + * Non-maintainer upload. + * Disable -DDEBUG which is a massive security hole, closes: #98839. + + -- James Troup <james@nocrew.org> Sun, 27 May 2001 01:09:31 +0100 + +screen (3.9.8-6) unstable; urgency=low + + * Updated copyright file + * Applied patch from Ryan King <rking@caseta.com> to be + able to work correctly on many-lined terminals (closes: Bug#80337) + + -- Juan Cespedes <cespedes@debian.org> Tue, 22 May 2001 00:23:00 +0200 + +screen (3.9.8-5) unstable; urgency=low + + * Fixed small typo in info file + * Clean up small lintian bugs + * Make commands related to bufferfile (readbuf, writebuf) + work again (Oops) (closes: Bug#45359, Bug#69275, Bug#83759) + + -- Juan Cespedes <cespedes@debian.org> Sat, 19 May 2001 15:12:11 +0200 + +screen (3.9.8-4) unstable; urgency=low + + * Make /etc/pam.d/screen be a conffile (closes: Bug#58696) + * Remove option "autofixterm" from manual page (closes: Bug#97019) + * Applied patch to make screen work OK on Hurd (closes: Bug#97343) + + -- Juan Cespedes <cespedes@debian.org> Mon, 14 May 2001 03:00:34 +0200 + +screen (3.9.8-3) unstable; urgency=low + + * Fixed small bug which caused `aterm' to display + everything underlined (closes: Bug#97327) + + -- Juan Cespedes <cespedes@debian.org> Sun, 13 May 2001 15:39:19 +0200 + +screen (3.9.8-2) unstable; urgency=low + + * New version uploaded to unstable instead of "stable unstable" (sorry) + + -- Juan Cespedes <cespedes@debian.org> Tue, 8 May 2001 22:28:35 +0200 + +screen (3.9.8-1) stable unstable; urgency=medium + + * New upstream version (closes: Bug#74310, Bug#89215) + * New Standards-Version (3.5.3) + * Applied patch to build cleanly on ia64 (closes: #91964) + * Fixed small bug regarding creation of sockets dir + when running as root + + -- Juan Cespedes <cespedes@debian.org> Mon, 7 May 2001 23:26:40 +0200 + +screen (3.9.5-9) stable unstable; urgency=HIGH + + * Fixed security bug (group utmp compromise) + + -- Juan Cespedes <cespedes@debian.org> Sat, 2 Sep 2000 17:51:28 +0200 + +screen (3.9.5-8) frozen unstable; urgency=low + + * Correct wrong build-dependency (libncurses5-dev + instead of libncurses4-dev) (closes: Bug#57989) + * Include a /etc/pam.d/screen file (closes: Bug#57592) + + -- Juan Cespedes <cespedes@debian.org> Mon, 14 Feb 2000 10:07:52 +0100 + +screen (3.9.5-7) frozen unstable; urgency=low + + * Built against libncurses5 instead of obsoleted libncurses4 + + -- Juan Cespedes <cespedes@debian.org> Sun, 6 Feb 2000 21:26:59 +0100 + +screen (3.9.5-6) unstable; urgency=low + + * Make `screen' work correctly both as root and non-root + (closes: Bug#53290, Bug#53329) + + -- Juan Cespedes <cespedes@debian.org> Thu, 23 Dec 1999 16:48:02 +0100 + +screen (3.9.5-5) unstable; urgency=low + + * New Standards-Version (3.1.1) + * Acknowledge NMU-fixed bugs (closes: Bug#50394, Bug#51058, Bug#51316) + * Changed screens directory from $HOME to /var/run/screen (closes: Bug#51088) + * Removed debconf support: no configuration is necessary in this program + + -- Juan Cespedes <cespedes@debian.org> Sun, 19 Dec 1999 06:04:48 +0100 + +screen (3.9.5-4.1) unstable; urgency=low + + * Non-maintainer release. + * Run autoconf to resync configure with configure.in + (closes:Bug#50394,#51058). + + -- Joel Klecker <espy@debian.org> Mon, 29 Nov 1999 08:38:18 -0800 + +screen (3.9.5-4) unstable; urgency=low + + * Used debconf + + -- Juan Cespedes <cespedes@debian.org> Sun, 14 Nov 1999 23:51:10 +0100 + +screen (3.9.5-3) unstable; urgency=low + + * Applied patch from Joel Klecker <espy@debian.org> to use getpt() + to get PTYs (closes: Bug#45628, Bug#48856) + + -- Juan Cespedes <cespedes@debian.org> Tue, 2 Nov 1999 16:42:41 +0100 + +screen (3.9.5-2.1) unstable; urgency=low + + * NMU. Backed out pty which didn't free ptys correctly. (Fixes: #45628) + + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Sat, 30 Oct 1999 17:07:08 +0200 + +screen (3.9.5-2) unstable; urgency=low + + * Added missing "prerm" file (lintian) + + -- Juan Cespedes <cespedes@debian.org> Fri, 1 Oct 1999 10:13:17 +0200 + +screen (3.9.5-1) unstable; urgency=low + + * New upstream version (closes: Bug#45173) + * FHS (/usr/doc/screen -> /usr/share/screen) + * PAM support + * Move "screen-exchange" file to ${HOME} (closes: Bug#45449) + + -- Juan Cespedes <cespedes@debian.org> Sun, 19 Sep 1999 20:24:56 +0200 + +screen (3.9.4-1) unstable; urgency=low + + * New upstream version, lots of improvements (closes: Bug#43932) + * Removed setuid, make it setgid "utmp" (closes: Bug#43909, Bug#43931) + * Uses "vlock" to lock screen if available + * Avoid braces in debian/rules (closes: Bug#36888) + * Use Unix98 style PTYs (closes: Bug#34578, Bug#37208, Bug#37863) + * Closed old bugs (closes: Bug#29523, Bug#35469) + * "screen" now defaults to MAXWIN=40 (closes: Bug#42420) + * Compile cleanly on glibc-2.1 systems (closes: Bug#26645) + * New Standards-Version: 3.0.1 (but keeping docs in /usr/doc) + + -- Juan Cespedes <cespedes@debian.org> Fri, 10 Sep 1999 16:14:41 +0200 + +screen (3.7.6-1) unstable; urgency=low + + * New upstream version: + Wayne's resize.c patch to keep the cursor onscreen. FindWindow + corrected. AIX4 patch from robert@mayday.cix.co.uk. Fixed + kanji am & markcursor bugs. SCO support (Gert Doering). + Wayne's statusline extra space. New flag nospc for MakeWinMsg. + New TF capability: add missing termcap/info caps. + screen-exchange security fix. Use kstat for Solaris' loadavg. + Check for mode 775 if screen runs setgid. Fixed typo in silence + command. Allow detach with no tty. HPUX10.20 ltchars hack. + Use @1/@7 as replacement for kh/kH. Use seteuid before calling + tgetent. Check for displays in Msg(). Linux ncurses hack: + redefine _nc_timed_wait. Configure check for ncurses (sigh). + ITOH Yasufumi: kanji fixes, osf support, bug fixes. More secure + Rewrite(). Increased line buffer size to 2048 bytes. + SCO-5 Fixes (Brian L. Gentry). resize code now handles tabs + correctly. + * Applied NMU from Christian Meder for glibc-2.1: Bug#32814 + + -- Juan Cespedes <cespedes@debian.org> Thu, 11 Feb 1999 18:32:01 +0100 + +screen (3.7.4-9.1) frozen unstable; urgency=low + + * non maintainer, sparc only upload + * apply patch for glibc2.1 from BTS + * undefine SVR4 from configure script: glibc2.1's utmpx.h is incompatible + with SVR4 + + -- Christian Meder <meder@isr.uni-stuttgart.de> Thu, 26 Nov 1998 15:40:30 +0100 + +screen (3.7.4-9) frozen unstable; urgency=medium + + * Recompile against libncurses4 + * /etc/terminfo/s/screen is now in ncurses-base, so screen doesn't + depend on ncurses-term anymore + + -- Juan Cespedes <cespedes@debian.org> Wed, 11 Nov 1998 18:17:37 +0100 + +screen (3.7.4-8) stable unstable; urgency=HIGH + + * Fix critical bug #25970: /tmp race problem + + -- Juan Cespedes <cespedes@debian.org> Thu, 27 Aug 1998 23:08:40 +0200 + +screen (3.7.4-7) unstable; urgency=low + + * Add support for MD5 passwords (Bug#22740, Bug#25487) + + -- Juan Cespedes <cespedes@debian.org> Fri, 7 Aug 1998 10:40:16 +0200 + +screen (3.7.4-6) unstable; urgency=low + + * Pass SIGWINCH to applications when size changes (fixes:Bug#18471) + + -- Juan Cespedes <cespedes@debian.org> Sun, 22 Feb 1998 11:16:46 +0100 + +screen (3.7.4-5) unstable; urgency=low + + * Fixed minor bug in debian/rules clean + * `screen' now depends on `ncurses-term', so it doesn't install its + own terminfo entry + * New Standards-Version: 2.4.0.0 + + -- Juan Cespedes <cespedes@debian.org> Thu, 12 Feb 1998 16:10:22 +0100 + +screen (3.7.4-4) unstable; urgency=low + + * Changed upstream changelog name (ChangeLog.gz -> changelog.gz) + * Changed sockets from /tmp to /var/run (closes:Bug#6487) + * New Standards-Version: 2.3.0.1 + * Changed behaviour of backspace key (now sends `DEL' == 0177) + + -- Juan Cespedes <cespedes@debian.org> Sun, 4 Jan 1998 21:13:51 +0100 + +screen (3.7.4-3) unstable; urgency=low + + * New maintainer + * New Standards-Version: 2.3.0.0 + * Minor fixes in /usr/doc/screen + * Pristine Source + * Fixed Bug#12626 + + -- Juan Cespedes <cespedes@debian.org> Sat, 11 Oct 1997 02:14:43 +0200 + +screen (3.7.4-2) unstable; urgency=low + + * Added definition of kend to screeninfo.src. + * Recompiled for libc6. + + -- joost witteveen <joost@rulcmc.leidenuniv.nl> Fri, 3 Oct 1997 22:18:45 +0200 + +screen (3.7.4-1) unstable; urgency=low + + * Upgraded to upstream version. + * fixed /etc/screenrc problem (used to read: /usr/etc/screenrc). + + -- joost witteveen <joost@rulcmc.leidenuniv.nl> Sat, 2 Aug 1997 22:26:08 +0200 + +screen (3.7.2-5) unstable; urgency=low + + * Recompiled for libc6 (now should be using libc functions for utmp access) + + -- joost witteveen <joost@rulcmc.leidenuniv.nl> Thu, 19 Jun 1997 17:48:26 +0200 + +screen (3.7.2-4) unstable; urgency=low + + * After suggestions from David Luyer, increase the number of tty's to 256. + + -- joost witteveen <joost@rulcmc.leidenuniv.nl> Sun, 4 May 1997 17:25:00 +0200 + +screen (3.7.2-3) stable unstable; urgency=high + + * Security fix for buffer-overrun posted to bugtraq. + + -- joost witteveen <joost@rulcmc.leidenuniv.nl> Fri, 21 Feb 1997 17:02:30 +0100 + +screen (3.7.2-2) unstable; urgency=low + + * This package contained a /usr/doc/screen/screeninfo.src.gz (compressed) + that is apparently needed by the install phase. uncompressed it. + + -- joost witteveen <joost@rulcmc.leidenuniv.nl> Tue, 7 Jan 1997 21:22:32 +0100 + +screen (3.7.2-1) unstable; urgency=low + + * Upgraded to upstream version + * converted to new source format + + -- joost witteveen <joost@rulcmc.leidenuniv.nl> Sat, 4 Jan 1997 11:40:40 +0100 diff --git a/debian/config b/debian/config new file mode 100644 index 0000000..1bcd393 --- /dev/null +++ b/debian/config @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $Id: config,v 1.10 2002/04/09 03:21:13 laz Exp $ +# $Source: /home/laz/project/cvsroots/debian/screen/debian/config,v $ +# +# config +# + +set -e +. /usr/share/debconf/confmodule diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..e9dc79d --- /dev/null +++ b/debian/control @@ -0,0 +1,21 @@ +Source: screen +Section: misc +Priority: optional +Maintainer: Adam Lazur <zal@debian.org> +Standards-Version: 3.5.4 +Build-Depends: libncurses5-dev, texinfo, libpam0g-dev, base-passwd (>= 2.0.3.4), debhelper (>> 3.0.0) + +Package: screen +Architecture: any +Depends: ${shlibs:Depends}, base-passwd (>= 2.0.3.4) +Pre-Depends: debconf (>= 0.2.17) +Conflicts: suidmanager (<< 0.52) +Description: A terminal multiplexor with VT100/ANSI terminal emulation. + screen is a terminal multiplexor that runs several separate "screens" on a + single physical character-based terminal. Each virtual terminal emulates a + DEC VT100 plus several ANSI X3.64 and ISO 2022 functions. Screen sessions + can be detached and resumed later on a different terminal. + . + Screen also supports a whole slew of other features. Some of these are: + configurable input and output translation, serial port support, configurable + logging, multi-user support, and utf8 charset support. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..998ea2c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +This is the Debian prepackaged version of screen, a screen manager with +VT100/ANSI terminal emulation. + +This package was put together from sources obtained from: + ftp://ftp.uni-erlangen.de/pub/utilities/screen + +See the info documentation for contact information for the upstream authors. + +You are free to distribute this software under the terms of the GNU +General Public License version 2. + +On Debian systems, the complete text of the GNU General Public License can +be found in /usr/share/common-licenses/GPL file. + +Copyrights +---------- +Copyright (C) 1987 Oliver Laumann +Copyright (C) 1991 Wayne Davidson +Copyright (C) 1993 Juergen Weigert <jnweiger@immd4.informatik.uni-erlangen.de> +Copyright (C) 1993 Michael Schroeder <mlschroe@immd4.informatik.uni-erlangen.de> + +Debian Modifications: + Copyright (C) 1996 Ian Murdock <imurdock@debian.org> + Copyright (C) 1997 joost witteveen <joost@rulcmc.leidenuniv.nl> + Copyright (C) 1997-2001 Juan Cespedes <cespedes@debian.org> + Copyright (C) 2001-2002 Adam Lazur <zal@debian.org> + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..a0a9128 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +etc +var/run/screen diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..645d9f9 --- /dev/null +++ b/debian/docs @@ -0,0 +1,10 @@ +NEWS +README +TODO +doc/FAQ +doc/fdpat.ps +doc/window_to_display.ps +etc/screenrc +etc/etcscreenrc +terminfo +debian/README.Debian diff --git a/debian/info b/debian/info new file mode 100644 index 0000000..d5cfa46 --- /dev/null +++ b/debian/info @@ -0,0 +1,6 @@ +doc/screen.info +doc/screen.info-1 +doc/screen.info-2 +doc/screen.info-3 +doc/screen.info-4 +doc/screen.info-5 diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..39b73be --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +doc/screen.1 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..e5df4b1 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +# gotta source this b/c the package uses debconf and we don't want lintian to +# whine about it... +. /usr/share/debconf/confmodule + +case "$1" in + configure) ;; + abort-upgrade|abort-deconfigure|abort-remove) exit 0 ;; + *) + echo "ERROR: screen postinst called with unknown argument \"$1\"." + echo "Aborting configuration of screen package." + exit 1 ;; +esac + +# /var/run/screens was used in previous releases and is now depricated +if [ -d /var/run/screens ] ; then + rm -rf /var/run/screens +fi + +#DEBHELPER# diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..ccb0373 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +case "$1" in + remove) ;; + purge) ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) exit 0 ;; + *) + echo "ERROR: screen postrm called with unknown argument \"$1\"." + echo "Aborting removal of screen package." + exit 1 ;; +esac + +rm -rf /var/run/screen + +#DEBHELPER# diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..ec44b9c --- /dev/null +++ b/debian/preinst @@ -0,0 +1,58 @@ +#!/bin/sh +# +# $Id: preinst,v 1.15 2002/04/11 02:01:21 laz Exp $ +# + +set -e +[ -n "$DEBUG" ] && set -vx + +action=$1 +version=$2 + +# gimme da debconf +set +vx +. /usr/share/debconf/confmodule +[ -n "$DEBUG" ] && set -vx + +if [ "$action" = "upgrade" ] ; then + # use procps' pgrep if possible + if which pgrep > /dev/null ; then + PGREP="pgrep -x " + else + # if not, manufacture our own pgrep using awk and ps... sucko + PGREP=screenmaint_pgrep + + screenmaint_pgrep() { + ps auxww | awk "{ + if (match(\$11,\"screen\")!=0 || match(\$11,\"SCREEN\")!=0) { + print \$2; + } + }" + } + + fi + + if dpkg --compare-versions "$version" lt "3.9.5-5" ; then + if [ ! -z "$($PGREP screen)" ] ; then + # if they're running an old version and there are screen processes + # running, then prompt + + # reset these no matter what + db_reset screen/old_upgrade_prompt || true + db_fset screen/old_upgrade_prompt seen false || true + + # then prompt + db_input high screen/old_upgrade_prompt || true + db_go || true + + # and find out what they said + db_get screen/old_upgrade_prompt || true + if [ "$RET" = "false" ]; then + exit 1 + fi + fi + fi +fi + +#DEBHELPER# + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..dc75ed7 --- /dev/null +++ b/debian/rules @@ -0,0 +1,92 @@ +#!/usr/bin/make -f +# +# Copyright (C) 1997 joost witteveen <joost@rulcmc.leidenuniv.nl> +# Copyright (C) 1997-2001 Juan Cespedes <cespedes@debian.org> +# Copyright (C) 2001 Adam Lazur <zal@debian.org> + +# Uncomment me to turn on debugging +#export DH_VERBOSE=1 + +# the debhelper compatability version +export DH_COMPAT=3 + +package = screen + +ROOT = $$PWD/debian/$(package) + +# statically define this... sucko +TTYGROUP = 5 + +configure-stamp: + dh_testdir + ./configure --prefix=/usr \ + --infodir='$$(prefix)/share/info' \ + --mandir='$$(prefix)/share/man' \ + --with-socket-dir=/var/run/screen \ + --enable-pam \ + --enable-rxvt_osc \ + --with-sys-screenrc=/etc/screenrc +# --enable-colors256 + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) CFLAGS='-O2 -g -Wall -DUSE_PAM -DPTYMODE=0620 -DPTYGROUP=$(TTYGROUP)' + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f configure-stamp build-stamp + # clean up after the build process + -$(MAKE) clean + rm -rf config.status + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) prefix=$(ROOT)/usr SCREENENCODINGS='$$(prefix)/share/screen/utf8encodings' install + # install the debian screenrc to etc + install -m 644 debian/screenrc $(ROOT)/etc + # hack around the fact that the install target makes screen a symlink + # to screen-$(VERSION) + rm -f $(ROOT)/usr/bin/screen + mv -f $(ROOT)/usr/bin/screen* $(ROOT)/usr/bin/screen + # make it setgid utmp + chmod 2755 $(ROOT)/usr/bin/screen + chown root:utmp $(ROOT)/usr/bin/screen + chmod 775 $(ROOT)/var/run/screen + chown root:utmp $(ROOT)/var/run/screen + # lintian overrides for the setgid bin etc + install -m 755 -d $(ROOT)/usr/share/lintian/overrides + install -m 644 debian/screen.lintian.overrides $(ROOT)/usr/share/lintian/overrides/screen + # cheat a little here and copy the README.terminfo into the terminfo + # dir for dh_installdocs to pick up later + install -m 644 debian/README.terminfo terminfo + +binary: binary-arch + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs + dh_installexamples + dh_installpam + dh_installman || true + dh_installinfo + dh_installchangelogs -k patchlevel.h + dh_strip + dh_compress + dh_fixperms -X/usr/bin/screen -X/var/run/screen + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/screen.lintian.overrides b/debian/screen.lintian.overrides new file mode 100644 index 0000000..e5883c1 --- /dev/null +++ b/debian/screen.lintian.overrides @@ -0,0 +1,2 @@ +screen: non-standard-dir-perm var/run/screen/ 0775 != 0755 +screen: setgid-binary usr/bin/screen 2755 root/utmp diff --git a/debian/screen.pam b/debian/screen.pam new file mode 100644 index 0000000..a14122a --- /dev/null +++ b/debian/screen.pam @@ -0,0 +1,6 @@ +# $Id: screen.pam,v 1.1 2002/02/06 19:06:42 laz Exp $ +# +# This is the PAM configuration file for screen(1) +# + +auth required pam_unix.so diff --git a/debian/screenrc b/debian/screenrc new file mode 100644 index 0000000..6cf7caa --- /dev/null +++ b/debian/screenrc @@ -0,0 +1,108 @@ +# $Id: screenrc,v 1.8 2002/03/20 22:20:21 laz Exp $ +# +# /etc/screenrc +# +# This is the system wide screenrc. +# +# You can use this file to change the default behavior of screen system wide +# or copy it to ~/.screenrc and use it as a starting point for your own +# settings. +# +# Commands in this file are used to set options, bind screen functions to +# keys, redefine terminal capabilities, and to automatically establish one or +# more windows at the beginning of your screen session. +# +# This is not a comprehensive list of options, look at the screen manual for +# details on everything that you can put in this file. +# + +# ------------------------------------------------------------------------------ +# SCREEN SETTINGS +# ------------------------------------------------------------------------------ + +#startup_message off +#nethack on + +#defflow on # will force screen to process ^S/^Q +deflogin on +#autodetach off + +# turn visual bell on +vbell on +vbell_msg " Wuff ---- Wuff!! " + +# define a bigger scrollback, default is 100 lines +defscrollback 1024 + +# ------------------------------------------------------------------------------ +# SCREEN KEYBINDINGS +# ------------------------------------------------------------------------------ + +# Remove some stupid / dangerous key bindings +bind '^k' +#bind 'L' +bind '^\' +# Make them better +bind '\\' quit +bind 'K' kill +bind 'I' login on +bind 'O' login off +bind '}' history + +#bind 'R' colon "screen -ln rlogin faui -8^b^b^b" +bind 'P' colon "^p" + +# An example of a "screen scraper" which will launch urlview on the current +# screen window +# +#bind ^B eval "hardcopy_append off" "hardcopy -h $HOME/.screen-urlview" "screen urlview $HOME/.screen-urlview" + +# on Debian backspace should send char `\177': +bindkey -k kb stuff "\177" + +# ------------------------------------------------------------------------------ +# TERMINAL SETTINGS +# ------------------------------------------------------------------------------ + +# The vt100 description does not mention "dl". *sigh* +termcapinfo vt100 dl=5\E[M + +# turn sending of screen messages to hardstatus off +hardstatus off +# Set the hardstatus prop on gui terms to set the titlebar/icon title +termcapinfo xterm*|rxvt*|kterm*|Eterm* hs:ts=\E]0;:fs=\007:ds=\E]0;\007 +# use this for the hard status string +hardstatus string "%h%? users: %u%?" + +# An alternative hardstatus to display a bar at the bottom listing the +# windownames and highlighting the current windowname in blue. (This is only +# enabled if there is no hardstatus setting for your terminal) +# +#hardstatus lastline "%-Lw%{= BW}%50>%n%f* %t%{-}%+Lw%<" + +# set these terminals up to be 'optimal' instead of vt100 +termcapinfo xterm*|linux*|rxvt*|Eterm* OP + +# Change the xterm initialization string from is2=\E[!p\E[?3;4l\E[4l\E> +# (This fixes the "Aborted because of window size change" konsole symptoms found +# in bug #134198) +termcapinfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l' + +# Do not use xterms alternate window buffer (won't add lines to scrollback bfr) +#termcapinfo xterm|xterms|xs ti=\E7\E[?47l + +# ------------------------------------------------------------------------------ +# STARTUP SCREENS +# ------------------------------------------------------------------------------ + +# Example of automatically running some programs in windows on screen startup. +# +# The following will open top in the first window, an ssh session to monkey +# in the next window, and then open mutt and tail in windows 8 and 9 +# respectively. +# +# screen top +# screen -t monkey ssh monkey +# screen -t mail 8 mutt +# screen -t daemon 9 tail -f /var/log/daemon.log + diff --git a/debian/templates b/debian/templates new file mode 100644 index 0000000..575d56c --- /dev/null +++ b/debian/templates @@ -0,0 +1,8 @@ +Template: screen/old_upgrade_prompt +Type: boolean +Default: false +Description: You may lose currently running screen sessions. Continue the install? + This version of screen is incompatible with all versions before 3.9.5-5. + . + If you continue with the installation, you will not be able to access + currently running screen sessions. diff --git a/debian/templates.de b/debian/templates.de new file mode 100644 index 0000000..00bd0b9 --- /dev/null +++ b/debian/templates.de @@ -0,0 +1,13 @@ +Template: screen/old_upgrade_prompt +Type: boolean +Default: false +Description: You may lose currently running screen sessions. Continue the install? + This version of screen is incompatible with all versions before 3.9.5-5. + . + If you continue with the installation, you will not be able to access + currently running screen sessions. +Description-de: Sie k=F6nnten aktive Screen-Sitzungen verlieren. Installation fortsetzen? + Diese screen-Version ist inkompatibel mit allen Versionen vor 3.9.5-5. + . + Wenn Sie die Installation fortsetzen, dann werden Sie auf alle im Moment + aktiven screen-Sitzungen nicht mehr zugreifen k=F6nnen. diff --git a/debian/templates.es b/debian/templates.es new file mode 100644 index 0000000..9a3f90b --- /dev/null +++ b/debian/templates.es @@ -0,0 +1,14 @@ +Template: screen/old_upgrade_prompt +Type: boolean +Default: false +Description: You may lose currently running screen sessions. Continue the install? + This version of screen is incompatible with all versions before 3.9.5-5. + . + If you continue with the installation, you will not be able to access + currently running screen sessions. +Description-es: Puede perder las sesiones de screen que tiene abiertas. ¿Continuar? + La versión que está instalando de screen es incompatible con todas las + versiones anteriores a la 3.9.5-5. + . + Si continúa con la instalación, no podrá acceder a las sesiones de screen + que tenga abiertas. diff --git a/debian/templates.fr b/debian/templates.fr new file mode 100644 index 0000000..bf85b77 --- /dev/null +++ b/debian/templates.fr @@ -0,0 +1,14 @@ +Template: screen/old_upgrade_prompt +Type: boolean +Default: false +Description: You may lose currently running screen sessions. Continue the install? + This version of screen is incompatible with all versions before 3.9.5-5. + . + If you continue with the installation, you will not be able to access + currently running screen sessions. +Description-fr: Vous pouvez perdre les sessions de screen en cours. Faut-il poursuivre l'installation ? + Cette version est incompatible avec toutes les versions antérieures à la + version 3.9.5-5. + . + Si vous continuez l'installation, vous ne pourrez plus accéder aux sessions + de screen en cours. diff --git a/debian/templates.ru b/debian/templates.ru new file mode 100644 index 0000000..f584fd2 --- /dev/null +++ b/debian/templates.ru @@ -0,0 +1,13 @@ +Template: screen/old_upgrade_prompt +Type: boolean +Default: false +Description: You may lose currently running screen sessions. Continue the install? + This version of screen is incompatible with all versions before 3.9.5-5. + . + If you continue with the installation, you will not be able to access + currently running screen sessions. +Description-ru: óÅÊÞÁÓ ×Ù ÍÏÖÅÔÅ ÐÏÔÅÒÑÔØ ÚÁÐÕÝÅÎÎÙÅ ÓÅÓÓÉÉ screen. ðÒÏÄÏÌÖÉÔØ ÕÓÔÁÎÏ×ËÕ? + üÔÁ ×ÅÒÓÉÑ screen ÎÅÓÏ×ÍÅÓÔÉÍÁ ÓÏ ×ÓÅÍÉ ×ÅÒÓÉÑÍÉ ÄÏ 3.9.5-5. + . + åÓÌÉ ×Ù ÐÒÏÄÏÌÖÉÔÅ ÕÓÔÁÎÏ×ËÕ, ÔÏ ×Ù ÌÉÛÉÔÅÓØ ÚÁÐÕÝÅÎÎÙÈ ÓÅÊÞÁÓ ÓÅÓÓÉÊ + screen. @@ -3357,8 +3357,9 @@ char *data; #ifdef ENCODINGS if (D_encoding != (D_forecv ? D_forecv->c_layer->l_encoding : 0)) { - int i, j, c; + int i, j, c, enc; char buf2[IOSIZE * 2 + 10]; + enc = D_forecv ? D_forecv->c_layer->l_encoding : 0; for (i = j = 0; i < size; i++) { c = ((unsigned char *)buf)[i]; @@ -3370,11 +3371,11 @@ char *data; if (pastefont) { int font = 0; - j += EncodeChar(buf2 + j, c, D_forecv->c_layer->l_encoding, &font); - j += EncodeChar(buf2 + j, 0, D_forecv->c_layer->l_encoding, &font); + j += EncodeChar(buf2 + j, c, enc, &font); + j += EncodeChar(buf2 + j, -1, enc, &font); } else - j += EncodeChar(buf2 + j, c, D_forecv->c_layer->l_encoding, 0); + j += EncodeChar(buf2 + j, c, enc, 0); if (j > sizeof(buf2) - 10) /* just in case... */ break; } diff --git a/doc/screen.1 b/doc/screen.1 index aad6aef..03bd3c8 100644 --- a/doc/screen.1 +++ b/doc/screen.1 @@ -99,7 +99,7 @@ create the new window. The above example would start the emacs editor (editing prog.c) and switch to its window. .PP -If \*Q/etc/utmp\*U is writable by +If \*Q/var/run/utmp\*U is writable by .IR screen , an appropriate record will be written to this file for each window, and removed when the window is terminated. @@ -228,7 +228,7 @@ See the \*Qdefflow\*U .screenrc command for details. The use of this option is discouraged. .TP 5 .BR \-l " and " \-ln -turns login mode on or off (for /etc/utmp updating). +turns login mode on or off (for /var/run/utmp updating). This can also be defined through the \*Qdeflogin\*U .screenrc command. .TP 5 .BR \-ls " and " \-list @@ -576,7 +576,7 @@ Show a listing of all currently attached displays. .SH CUSTOMIZATION The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to -/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If +/tmp/screens or preferably to /var/run/screen chosen at compile-time. If .I screen is installed setuid-root, then the administrator should compile @@ -589,7 +589,7 @@ in the environment variable $SCREENDIR. When .I screen is invoked, it executes initialization commands from the files -\*Q/usr/local/etc/screenrc\*U and +\*Q/etc/screenrc\*U and \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's defaults\*U that can be overridden in the following ways: for the global screenrc file @@ -1601,7 +1601,7 @@ and then compile the entry with The echo command may be used to annoy .I screen users with a 'message of the -day'. Typically installed in a global /local/etc/screenrc. +day'. Typically installed in a global /etc/screenrc. The option \*Q-n\*U may be used to suppress the line feed. See also \*Qsleep\*U. Echo is also useful for online checking of environment variables. @@ -4271,14 +4271,14 @@ Examples in the .I screen distribution package for private and global initialization files. .IP $SYSSCREENRC -.IP /usr/local/etc/screenrc +.IP /etc/screenrc .I screen initialization commands .IP $SCREENRC .IP $HOME/.screenrc -Read in after /usr/local/etc/screenrc +Read in after /etc/screenrc .IP $SCREENDIR/S-<login> -.IP /local/screens/S-<login> +.IP /var/run/screen/S-<login> Socket directories (default) .IP /usr/tmp/screens/S-<login> Alternate socket directories. @@ -4297,7 +4297,7 @@ Output log files created by the log function or .IP /etc/termcap Terminal capability databases -.IP /etc/utmp +.IP /var/run/utmp Login records .IP $LOCKPRG Program that locks a terminal. @@ -4410,9 +4410,9 @@ does not make use of hardware tabs. must be installed as set-uid with owner root on most systems in order to be able to correctly change the owner of the tty device file for each window. -Special permission may also be required to write the file \*Q/etc/utmp\*U. +Special permission may also be required to write the file \*Q/var/run/utmp\*U. .IP \(bu -Entries in \*Q/etc/utmp\*U are not removed when +Entries in \*Q/var/run/utmp\*U are not removed when .I screen is killed with SIGKILL. This will cause some programs (like "w" or "rwho") diff --git a/doc/screen.texinfo b/doc/screen.texinfo index eeb0cab..56576b1 100644 --- a/doc/screen.texinfo +++ b/doc/screen.texinfo @@ -176,7 +176,7 @@ name and its arguments to the window manager (specified in the $STY environment variable) who will use it to create the new window. The above example would start the @code{emacs} editor (editing @file{prog.c}) and switch to its window. -If @file{/etc/utmp} is writable by @code{screen}, an appropriate record +If @file{/var/run/utmp} is writable by @code{screen}, an appropriate record will be written to this file for each window, and removed when the window is closed. This is useful for working with @code{talk}, @code{script}, @code{shutdown}, @code{rsend}, @code{sccs} and other @@ -305,7 +305,7 @@ Control}). Its use is discouraged. @item -l @itemx -ln -Turn login mode on or off (for @file{/etc/utmp} updating). This option +Turn login mode on or off (for @file{/var/run/utmp} updating). This option is equivalent to the @code{deflogin} command (@pxref{Login}). @item -ls [@var{match}] @@ -442,7 +442,7 @@ to be executed at startup, or on the fly using the @code{colon} command. @cindex screenrc When @code{screen} is invoked, it executes initialization commands from the files @file{.screenrc} in the user's home directory and -@file{/usr/local/etc/screenrc}. These defaults can be overridden in the +@file{/etc/screenrc}. These defaults can be overridden in the following ways: For the global screenrc file @code{screen} searches for the environment variable @code{$SYSSCREENRC} (this override feature may be disabled at @@ -980,7 +980,7 @@ Log all output in the current window. @xref{Log}. @item logfile @var{filename} Place where to collect logfiles. @xref{Log}. @item login [@var{state}] -Log the window in @file{/etc/utmp}. @xref{Login}. +Log the window in @file{/var/run/utmp}. @xref{Login}. @item logtstamp [@var{state}] Configure logfile time-stamps. @xref{Log}. @item mapdefault @@ -1870,7 +1870,7 @@ terminal emulation itself. * Naming Windows:: Control the name of the window * Console:: See the host's console messages * Kill:: Destroy an unwanted window -* Login:: Control @file{/etc/utmp} logging +* Login:: Control @file{/var/run/utmp} logging * Mode:: Control the file mode of the pty * Monitor:: Watch for activity in a window * Windows:: List the active windows @@ -2079,7 +2079,7 @@ compile time (@pxref{Installation}). Both commands are only present when @kindex L @deffn Command login [state] (@kbd{C-a L})@* -Adds or removes the entry in @file{/etc/utmp} for the current window. +Adds or removes the entry in @file{/var/run/utmp} for the current window. This controls whether or not the window is @dfn{logged in}. In addition to this toggle, it is convenient to have ``log in'' and ``log out'' keys. For instance, @code{bind I login on} and @code{bind O @@ -4813,17 +4813,17 @@ Examples in the @code{screen} distribution package for private and global initialization files. @item @code{$SYSSCREENRC} -@itemx /local/etc/screenrc +@itemx /etc/screenrc @code{screen} initialization commands @item @code{$SCREENRC} @itemx @code{$HOME}/.iscreenrc @itemx @code{$HOME}/.screenrc -Read in after /local/etc/screenrc +Read in after /etc/screenrc @item @code{$SCREENDIR}/S-@var{login} -@item /local/screens/S-@var{login} +@item /var/run/screen/S-@var{login} Socket directories (default) @item /usr/tmp/screens/S-@var{login} @@ -4846,7 +4846,7 @@ Output log files created by the log command @itemx /etc/termcap Terminal capability databases -@item /etc/utmp +@item /var/run/utmp Login records @item @code{$LOCKPRG} @@ -4951,10 +4951,10 @@ capabilities to @code{$TERMCAP} may not have any effects. in order to be able to correctly change the owner of the tty device file for each window. Special permission may also be required to write the file -@file{/etc/utmp}. +@file{/var/run/utmp}. @item -Entries in @file{/etc/utmp} are not removed when @code{screen} is killed +Entries in @file{/var/run/utmp} are not removed when @code{screen} is killed with SIGKILL. This will cause some programs (like "w" or "rwho") to advertise that a user is logged on who really isn't. @@ -5035,7 +5035,7 @@ does not include these features of 4.2 and 4.3 BSD UNIX. @cindex socket directory The socket directory defaults either to @file{$HOME/.screen} or simply to -@file{/tmp/screens} or preferably to @file{/usr/local/screens} chosen at +@file{/tmp/screens} or preferably to @file{/var/run/screen} chosen at compile-time. If @code{screen} is installed setuid root, then the administrator should compile screen with an adequate (not NFS mounted) @code{SOCKDIR}. If @code{screen} is not @@ -55,11 +55,11 @@ struct encoding { struct encoding encodings[] = { { "C", 0, 0, 0, 0, 0 }, - { "eucJP", "B\002I\00401", 0, 1, 0, "\002\004I" }, - { "SJIS", "BIBB01", 0, 1, 1, "\002I" }, - { "eucKR", "B\003BB01", 0, 1, 0, "\003" }, - { "eucCN", "B\001BB01", 0, 1, 0, "\001" }, - { "Big5", "B\030BB01", 0, 1, 0, "\030" }, + { "eucJP", "B\002I\004\00204",0, 1, 0, "\002\004I" }, + { "SJIS", "BIBBI04", 0, 1, 1, "\002I" }, + { "eucKR", "B\003BB\00304",0, 1, 0, "\003" }, + { "eucCN", "B\001BB\00104",0, 1, 0, "\001" }, + { "Big5", "B\030BB\03004",0, 1, 0, "\030" }, { "KOI8-R", 0, 0x80|'!', 0, 1, 0 }, { "CP1251", 0, 0x80|'?', 0, 1, 0 }, { "UTF-8", 0, -1, 0, 0, 0 }, @@ -1032,7 +1032,7 @@ int *fontp; int t, f, l; debug2("Encoding char %02x for encoding %d\n", c, encoding); - if (c == 0 && fontp) + if (c == -1 && fontp) { if (*fontp == 0) return 0; @@ -1297,7 +1297,7 @@ unsigned char *tbuf; continue; j += EncodeChar(tbuf ? (char *)tbuf + j : 0, c, tenc, &font); } - j += EncodeChar(tbuf ? (char *)tbuf + j : 0, 0, tenc, &font); + j += EncodeChar(tbuf ? (char *)tbuf + j : 0, -1, tenc, &font); return j; } @@ -1456,7 +1456,7 @@ int encoding; int *fontp; { int f, l; - f = c >> 16; + f = (c == -1) ? 0 : c >> 16; l = 0; if (fontp && f != *fontp) { @@ -1486,7 +1486,7 @@ int *fontp; l += 3; } } - if (c == 0) + if (c == -1) return l; if (c & 0xff00) { @@ -294,6 +294,7 @@ char *pt; { c = c << 8 | (unsigned char)*im++; j++; + fo++; } # endif if (pastefont) @@ -1785,7 +1785,7 @@ int key; if (*args == 0) InputAKA(); else - ChangeAKA(fore, *args, 20); + ChangeAKA(fore, *args, MAXAKA); break; case RC_COLON: Input(":", 100, INP_COOKED, Colonfin, NULL); @@ -3353,14 +3353,15 @@ int key; break; } n = strlen(*args); - if (n == 0 || n > 6) + if (n == 0 || n > 7) { Msg(0, "%s: %s: string has illegal size.", rc_name, comms[nr].name); break; } - if (n > 4 && ( - ((args[0][4] < '0' || args[0][4] > '3') && args[0][4] != '.') || - ((args[0][5] < '0' || args[0][5] > '3') && args[0][5] && args[0][5] != '.'))) + if (n > 5 && ( + ((args[0][5] < '0' || args[0][5] > '4') && args[0][5] != '.') || + ((args[0][6] < '0' || args[0][6] > '4') && args[0][6] && + args[0][6] != '.'))) { Msg(0, "%s: %s: illegal mapping number.", rc_name, comms[nr].name); break; @@ -4515,7 +4516,7 @@ ShowInfo() else sprintf(p, " G%c[", wp->w_Charset + '0'); p += 4; - for (i = 0; i < 4; i++) + for (i = 0; i < 5; i++) { if (wp->w_charsets[i] == ASCII) *p++ = 'B'; @@ -4600,7 +4601,7 @@ char *data; /* dummy */ { ASSERT(display); if (len && fore) - ChangeAKA(fore, buf, 20); + ChangeAKA(fore, buf, MAXAKA); } static void @@ -4608,7 +4609,7 @@ InputAKA() { char *s, *ss; int n; - Input("Set window's title to: ", 20, INP_COOKED, AKAfin, NULL); + Input("Set window's title to: ", MAXAKA, INP_COOKED, AKAfin, NULL); s = fore->w_title; if (!s) return; @@ -679,6 +679,17 @@ int wi, he, hi; if (wi == 0) he = hi = 0; + if (wi > 1000) + { + Msg(0, "Window width too large, truncated"); + wi = 1000; + } + if (he > 1000) + { + Msg(0, "Window height too large, truncated"); + he = 1000; + } + if (p->w_width == wi && p->w_height == he && p->w_histheight == hi) { debug("ChangeWindowSize: No change.\n"); @@ -713,6 +713,23 @@ char **av; else break; } + + real_uid = getuid(); + real_gid = getgid(); + eff_uid = geteuid(); + eff_gid = getegid(); + if (eff_uid != real_uid) + { + /* if running with s-bit, we must install a special signal + * handler routine that resets the s-bit, so that we get a + * core file anyway. + */ +#ifdef SIGBUS /* OOPS, linux has no bus errors! */ + signal(SIGBUS, CoreDump); +#endif /* SIGBUS */ + signal(SIGSEGV, CoreDump); + } + #ifdef USE_LOCALE setlocale(LC_ALL, ""); #endif @@ -749,21 +766,6 @@ char **av; #endif if (ac) nwin.args = av; - real_uid = getuid(); - real_gid = getgid(); - eff_uid = geteuid(); - eff_gid = getegid(); - if (eff_uid != real_uid) - { - /* if running with s-bit, we must install a special signal - * handler routine that resets the s-bit, so that we get a - * core file anyway. - */ -#ifdef SIGBUS /* OOPS, linux has no bus errors! */ - signal(SIGBUS, CoreDump); -#endif /* SIGBUS */ - signal(SIGSEGV, CoreDump); - } /* make the write() calls return -1 on all errors */ #ifdef SIGXFSZ diff --git a/terminfo/screencap b/terminfo/screencap index d2becd4..3271df6 100644 --- a/terminfo/screencap +++ b/terminfo/screencap @@ -9,7 +9,7 @@ SC|screen|VT 100/ANSI X3.64 virtual terminal:\ :AL=\E[%dL:dl=\E[M:DL=\E[%dM:cs=\E[%i%d;%dr:dc=\E[P:\ :DC=\E[%dP:im=\E[4h:ei=\E[4l:IC=\E[%d@:\ :ks=\E[?1h\E=:ke=\E[?1l\E>:vb=\Eg:\ - :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\ + :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=\177:\ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\ :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ :kh=\E[1~:kI=\E[2~:kD=\E[3~:kH=\E[4~:@7=\E[4~:kP=\E[5~:\ diff --git a/terminfo/screeninfo.src b/terminfo/screeninfo.src index aee40a8..c982a54 100644 --- a/terminfo/screeninfo.src +++ b/terminfo/screeninfo.src @@ -9,7 +9,7 @@ screen|VT 100/ANSI X3.64 virtual terminal, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=\t, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\n, is2=\E)0, kbs=\b, kcub1=\EOD, kcud1=\EOB, + ind=\n, is2=\E)0, kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, @@ -33,7 +33,31 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=\t, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\n, is2=\E)0, kbs=\b, kcub1=\EOD, kcud1=\EOB, + ind=\n, is2=\E)0, kbs=\177, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP, + kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, + kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kend=\E[4~, + kich1=\E[2~, knp=\E[6~, kpp=\E[5~, nel=\EE, + rc=\E8, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>, + rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7, sgr0=\E[m, + smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, + tbc=\E[3g, smacs=^N, rmacs=^O, flash=\Eg, + civis=\E[?25l, cnorm=\E[34h\E[?25h, cvvis=\E[34l, + op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\054\054hhII00, +screen-bce|VT 100/ANSI X3.64 virtual terminal with bce, + am, km, mir, msgr, xenl, bce, + cols#80, it#8, lines#24, colors#8, pairs#64, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, + clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr, + cub=\E[%p1%dD, cub1=\b, cud=\E[%p1%dB, cud1=\n, + cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, + cuu=\E[%p1%dA, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, + dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, + enacs=\E(B\E)0, home=\E[H, + ht=\t, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, + ind=\n, is2=\E)0, kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, @@ -170,7 +170,7 @@ struct win char w_FontR; /* character font GR */ int w_Charset; /* charset number GL */ int w_CharsetR; /* charset number GR */ - int w_charsets[4]; /* Font = charsets[Charset] */ + int w_charsets[5]; /* Font = charsets[Charset] */ #endif int w_ss; int w_saved; @@ -179,7 +179,7 @@ struct win #ifdef FONT int w_SavedCharset; int w_SavedCharsetR; - int w_SavedCharsets[4]; + int w_SavedCharsets[5]; #endif int w_top, w_bot; /* scrollregion */ int w_wrap; /* autowrap */ |