home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
dejagnu-1.2-diffs.gz
/
dejagnu-1.2-diffs
Wrap
Text File
|
1996-10-13
|
289KB
|
9,201 lines
This file contains patches that transform the baseline version into
the amiga version. Assuming that you have unarchived the baseline
version in the current directory, just run the command:
patch -p1 -E -b .pbak <diff-file
where 'diff-file' is this patch file. After running patch you should
remove all the generated *.pbak files, and look for any *.rej files
that indicate a problem patching the baseline source.
diff -rup --new-file baseline/fsf/dejagnu/Makefile.in amiga/fsf/dejagnu/Makefile.in
--- baseline/fsf/dejagnu/Makefile.in Tue Apr 12 16:55:05 1994
+++ amiga/fsf/dejagnu/Makefile.in Sat Sep 28 00:00:00 1996
@@ -19,7 +19,7 @@
srcdir = .
-prefix = /usr/local
+prefix = /ade
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
@@ -53,11 +53,11 @@ INSTALL_XFORM = $(INSTALL) -t='$(program
AS = as
AR = ar
AR_FLAGS = rc
-CC = cc
+CC = gcc
# We don't specify -g -O because many compilers don't support -g -O,
# and/or -O is broken in and of itself.
-CFLAGS = -g
+CFLAGS = -O
CXX = gcc
diff -rup --new-file baseline/fsf/dejagnu/Product-Info amiga/fsf/dejagnu/Product-Info
--- baseline/fsf/dejagnu/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/dejagnu/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,40 @@
+.name
+dejagnu
+.type
+Programmer Tool
+.short
+Program testing framework using 'expect'
+.description
+DejaGnu is a framework for testing other programs. Its purpose is to
+provide a single front end for all tests. Beyond this, DejaGnu offers
+several advantages for testing:
+
+(1) The flexibility and consistency of the DejaGnu framework make it
+easy to write tests for any program.
+
+(2) DejaGnu provides a layer of abstraction which makes all tests (if
+correctly written) portable to any host or target where a program must
+be tested. For instance, a test for GDB can run (from any Unix based
+host) on any target architecture supported by DejaGnu. Currently
+DejaGnu runs tests on several single board computers, whose operating
+software ranges from just a boot monitor to a full-fledged, Unix-like
+realtime OS.
+
+(3) DejaGnu is written in expect, which in turn uses Tcl (Tool command
+language). The framework comprises two parts: the testing framework
+and the testsuites themselves. Tests are usually written in expect
+using Tcl.
+
+Both tcl and expect are provided with dejagnu.
+.version
+1.2
+.author
+Rob Savoye
+.email
+rob@darkstar.cygnus.com
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@amigalib.com)
+.submittal
+Downloaded from prep.ai.mit.edu:pub/gnu
diff -rup --new-file baseline/fsf/dejagnu/config.guess amiga/fsf/dejagnu/config.guess
--- baseline/fsf/dejagnu/config.guess Thu Apr 7 17:15:57 1994
+++ amiga/fsf/dejagnu/config.guess Sat Sep 28 00:00:00 1996
@@ -325,6 +325,10 @@ main()
#endif
#endif
+#if defined(__amigaos__)
+ printf("m68k-unknown-amigaos\n"); exit(0);
+#endif
+
exit (1);
}
EOF
diff -rup --new-file baseline/fsf/dejagnu/config.sub amiga/fsf/dejagnu/config.sub
--- baseline/fsf/dejagnu/config.sub Tue Apr 12 16:55:07 1994
+++ amiga/fsf/dejagnu/config.sub Sat Sep 28 00:00:00 1996
@@ -392,11 +392,11 @@ case $basic_machine in
os=-bsd
;;
amiga)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
;;
- amigados)
- basic_machine=m68k-cbm
- os=-amigados
+ amigaos)
+ basic_machine=m68k-unknown
+ os=-amigaos
;;
amigaunix | amix)
basic_machine=m68k-cbm
@@ -701,7 +701,7 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]* | -hpux* \
| -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
+ | -amigaos* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
| -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -netbsd* | -riscix* | -lynxos* \
@@ -829,7 +829,7 @@ case $basic_machine in
os=-sysv
;;
*-cbm)
- os=-amigados
+ os=-amigaos
;;
*-dg)
os=-dgux
diff -rup --new-file baseline/fsf/dejagnu/configure amiga/fsf/dejagnu/configure
--- baseline/fsf/dejagnu/configure Sat Apr 9 15:11:29 1994
+++ amiga/fsf/dejagnu/configure Sat Sep 28 00:00:00 1996
@@ -62,7 +62,7 @@ moveifchange=
norecursion=
other_options=
package_makefile_frag=
-prefix=/usr/local
+prefix=/ade
progname=
program_prefix=
program_prefixoption=
@@ -81,7 +81,7 @@ subdirs=
target_alias=NOTARGET
target_makefile_frag=
undefs=NOUNDEFS
-version="$Revision: 1.182 $"
+version="$Revision: 1.183 $"
x11=default
### we might need to use some other shell than /bin/sh for running subshells
@@ -101,7 +101,8 @@ NO_EDIT="This file was generated automat
progname=$0
# if PWD already has a value, it is probably wrong.
-if [ -n "$PWD" ]; then PWD=`pwd`; fi
+#AmigaOS change - pdksh treats PWD as readonly - fnf
+#if [ -n "$PWD" ]; then PWD=`pwd`; fi
case "${progname}" in
/*) ;;
@@ -158,6 +159,8 @@ do
;;
esac
;;
+ --cache-file*)
+ ;;
--disable-*)
enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
eval $enableopt=no
@@ -252,7 +255,7 @@ do
verbose=--verbose
;;
--version | --V | --vers*)
- echo "This is Cygnus Configure version" `echo ${version} | sed 's/[ $:]//g'`
+ echo "This is Cygnus Configure version" `/bin/echo ${version} | sed 's/[ $:]//g'`
exit 0
;;
--with-*)
@@ -363,8 +366,8 @@ if [ -n "${fatal}" -o "${host_alias}" =
echo Usage: configure [OPTIONS] HOST
echo
echo Options: [defaults in brackets]
- echo ' --prefix=MYDIR configure for installation of host independent files into MYDIR. ["/usr/local"]'
- echo ' --exec-prefix=MYDIR configure for installation of host dependent files into MYDIR. ["/usr/local"]'
+ echo ' --prefix=MYDIR configure for installation of host independent files into MYDIR. ["/ade"]'
+ echo ' --exec-prefix=MYDIR configure for installation of host dependent files into MYDIR. ["/ade"]'
echo ' --help print this message. [normal config]'
echo ' --build=BUILD configure for building on BUILD. [BUILD=HOST]'
echo ' --host=HOST configure for HOST. [determined via config.guess]'
@@ -632,9 +635,15 @@ for subdir in . ${subdirs} ; do
fi
${remove} -f ${link}
- # Make a symlink if possible, otherwise try a hard link
- ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
-
+ # Make a symlink if possible, otherwise try a hard link
+ if ${symbolic_link} ${srcdir}/${file} ${link} >/dev/null 2>&1 ; then
+ true
+ else
+ # We need to re-remove the file because Lynx leaves a
+ # very strange directory there when it fails an NFS symlink.
+ ${remove} -r -f ${link}
+ ${hard_link} ${srcdir}/${file} ${link}
+ fi
if [ ! -r ${link} ] ; then
echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1
@@ -939,6 +948,7 @@ if [ -z "${norecursion}" -a -n "${config
### The recursion line is here.
if [ ! -z "${recprog}" ] ; then
+ echo ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} ${prefixoption} ${tmpdiroption} ${exec_prefixoption} ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${removing} ${other_options} ${redirect}
if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${removing} ${other_options} ${redirect} ; then
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/Makefile.in amiga/fsf/dejagnu/dejagnu/Makefile.in
--- baseline/fsf/dejagnu/dejagnu/Makefile.in Mon Apr 4 12:05:46 1994
+++ amiga/fsf/dejagnu/dejagnu/Makefile.in Sat Sep 28 00:00:00 1996
@@ -1,5 +1,5 @@
srcdir = .
-prefix = /usr/local
+prefix = /ade
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
@@ -29,7 +29,7 @@ INSTALL = `cd $(srcdir); pwd`/../install
INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL)
-CFLAGS = -g
+CFLAGS = -O
CHILLFLAGS = $(CFLAGS)
CHILL_LIB = -lchill
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/doc/Makefile.in amiga/fsf/dejagnu/dejagnu/doc/Makefile.in
--- baseline/fsf/dejagnu/dejagnu/doc/Makefile.in Tue Mar 29 17:53:18 1994
+++ amiga/fsf/dejagnu/dejagnu/doc/Makefile.in Sat Sep 28 00:00:00 1996
@@ -1,4 +1,4 @@
-prefix = /usr/local
+prefix = /ade
exec_prefix = $(prefix)
srcdir = .
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/example/Makefile.in amiga/fsf/dejagnu/dejagnu/example/Makefile.in
--- baseline/fsf/dejagnu/dejagnu/example/Makefile.in Sun Jul 25 15:24:09 1993
+++ amiga/fsf/dejagnu/dejagnu/example/Makefile.in Sat Sep 28 00:00:00 1996
@@ -1,5 +1,5 @@
srcdir = .
-prefix = /usr/local
+prefix = /ade
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/example/calc/configure amiga/fsf/dejagnu/dejagnu/example/calc/configure
--- baseline/fsf/dejagnu/dejagnu/example/calc/configure Thu Nov 4 22:27:36 1993
+++ amiga/fsf/dejagnu/dejagnu/example/calc/configure Mon Sep 30 22:38:37 1996
@@ -1,399 +1,1096 @@
-#!/bin/sh
+#! /bin/sh
+
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf.
-# Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.10
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# Usage: configure [--srcdir=DIR] [--host=HOST] [--gas] [--nfp]
-# [--prefix=PREFIX] [--exec-prefix=PREFIX] [--with-PACKAGE[=VALUE]]
-# Ignores all args except --srcdir, --prefix, --exec-prefix, and
-# --with-PACKAGE[=VALUE] unless this script has special code to handle it.
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
-for arg
+ac_prev=
+for ac_option
do
- # Handle --exec-prefix with a space before the argument.
- if test x$next_exec_prefix = xyes; then exec_prefix=$arg; next_exec_prefix=
- # Handle --host with a space before the argument.
- elif test x$next_host = xyes; then next_host=
- # Handle --prefix with a space before the argument.
- elif test x$next_prefix = xyes; then prefix=$arg; next_prefix=
- # Handle --srcdir with a space before the argument.
- elif test x$next_srcdir = xyes; then srcdir=$arg; next_srcdir=
- else
- case $arg in
- # For backward compatibility, recognize -exec-prefix and --exec_prefix.
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* | --exec=* | --exe=* | --ex=* | --e=*)
- exec_prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;;
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- | --exec | --exe | --ex | --e)
- next_exec_prefix=yes ;;
-
- -gas | --gas | --ga | --g) ;;
-
- -host=* | --host=* | --hos=* | --ho=* | --h=*) ;;
- -host | --host | --hos | --ho | --h)
- next_host=yes ;;
-
- -nfp | --nfp | --nf) ;;
-
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;;
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- next_prefix=yes ;;
-
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=* | --s=*)
- srcdir=`echo $arg | sed 's/[-a-z_]*=//'` ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr | --s)
- next_srcdir=yes ;;
-
- -with-* | --with-*)
- package=`echo $arg|sed -e 's/-*with-//' -e 's/=.*//'`
- # Reject names that aren't valid shell variable names.
- if test -n "`echo $package| sed 's/[-a-zA-Z0-9_]//g'`"; then
- echo "configure: $package: invalid package name" >&2; exit 1
- fi
- package=`echo $package| sed 's/-/_/g'`
- case "$arg" in
- *=*) val="`echo $arg|sed 's/[^=]*=//'`" ;;
- *) val=1 ;;
- esac
- eval "with_$package='$val'" ;;
- -v | -verbose | --verbose | --verbos | --verbo | --verb | --ver | --ve | --v)
- verbose=yes ;;
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+ eval "$ac_prev=\$ac_option"
+ ac_prev=
+ continue
+ fi
+
+ 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
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir="$ac_optarg" ;;
+
+ -build | --build | --buil | --bui | --bu)
+ ac_prev=build ;;
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+ 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" ;;
+
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir="$ac_optarg" ;;
+
+ -disable-* | --disable-*)
+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+ # Reject names that are not valid shell variable names.
+ 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=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+ # Reject names that are not valid shell variable names.
+ 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
- fi
+ eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+ | --exec | --exe | --ex)
+ ac_prev=exec_prefix ;;
+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+ | --exec=* | --exe=* | --ex=*)
+ exec_prefix="$ac_optarg" ;;
+
+ -gas | --gas | --ga | --g)
+ # Obsolete; use --with-gas.
+ with_gas=yes ;;
+
+ -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]
+ --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide]
+ --psdir=DIR postscript documentation in DIR [PREFIX/ps]
+ --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi]
+ --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 ;;
+ -host=* | --host=* | --hos=* | --ho=*)
+ 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" ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir="$ac_optarg" ;;
+
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+ ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ 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" ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir="$ac_optarg" ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir="$ac_optarg" ;;
+
+ -nfp | --nfp | --nf)
+ # Obsolete; use --without-fp.
+ with_fp=no ;;
+
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c)
+ no_create=yes ;;
+
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+ no_recursion=yes ;;
+
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir="$ac_optarg" ;;
+
+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+ ac_prev=prefix ;;
+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+ 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-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-transform-name | --program-transform-name \
+ | --program-transform-nam | --program-transform-na \
+ | --program-transform-n | --program-transform- \
+ | --program-transform | --program-transfor \
+ | --program-transfo | --program-transf \
+ | --program-trans | --program-tran \
+ | --progr-tra | --program-tr | --program-t)
+ ac_prev=program_transform_name ;;
+ -program-transform-name=* | --program-transform-name=* \
+ | --program-transform-nam=* | --program-transform-na=* \
+ | --program-transform-n=* | --program-transform-=* \
+ | --program-transform=* | --program-transfor=* \
+ | --program-transfo=* | --program-transf=* \
+ | --program-trans=* | --program-tran=* \
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name="$ac_optarg" ;;
+
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir="$ac_optarg" ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir="$ac_optarg" ;;
+
+ -site | --site | --sit)
+ ac_prev=site ;;
+ -site=* | --site=* | --sit=*)
+ site="$ac_optarg" ;;
+
+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+ ac_prev=srcdir ;;
+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+ 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" ;;
+
+ -target | --target | --targe | --targ | --tar | --ta | --t)
+ ac_prev=target ;;
+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+ target="$ac_optarg" ;;
+
+ -v | -verbose | --verbose | --verbos | --verbo | --verb)
+ verbose=yes ;;
+
+ -version | --version | --versio | --versi | --vers)
+ echo "configure generated by autoconf version 2.10"
+ exit 0 ;;
+
+ -with-* | --with-*)
+ ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+ # Reject names that are not valid shell variable names.
+ 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=yes ;;
+ esac
+ eval "with_${ac_package}='$ac_optarg'" ;;
+
+ -without-* | --without-*)
+ ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+ # Reject names that are not valid shell variable names.
+ 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.
+ with_x=yes ;;
+
+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+ | --x-incl | --x-inc | --x-in | --x-i)
+ 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-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" ;;
+
+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+ ;;
+
+ *)
+ 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
-trap 'rm -fr conftest* confdefs* core; exit 1' 1 3 15
-trap 'rm -f confdefs*' 0
+if test -n "$ac_prev"; then
+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+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
+
+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
+ 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
# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = 'set' ; then LC_ALL=C; export LC_ALL; fi
-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 "${LANG+set}" = set; then LANG=C; export LANG; fi
-rm -f conftest* confdefs.h
+# 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
-compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1'
# 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.
-unique_file=calc.c
+ac_unique_file=calc.c
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
- srcdirdefaulted=yes
- # Try the directory containing this script, then `..'.
- prog=$0
- confdir=`echo $prog|sed 's%/[^/][^/]*$%%'`
- test "X$confdir" = "X$prog" && confdir=.
- srcdir=$confdir
- if test ! -r $srcdir/$unique_file; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then its parent.
+ ac_prog=$0
+ 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
srcdir=..
fi
+else
+ ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$unique_file; then
- if test x$srcdirdefaulted = xyes; then
- echo "configure: Can not find sources in \`${confdir}' or \`..'." 1>&2
+if test ! -r $srcdir/$ac_unique_file; then
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
else
- echo "configure: Can not find sources in \`${srcdir}'." 1>&2
+ { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
fi
- exit 1
fi
-# Preserve a srcdir of `.' to avoid automounter screwups with pwd.
-# But we can't avoid them for `..', to make subdirectories work.
-case $srcdir in
- .|/*|~*) ;;
- *) srcdir=`cd $srcdir; pwd` ;; # Make relative path absolute.
-esac
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ else
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+ echo "loading site script $ac_site_file"
+ . "$ac_site_file"
+ fi
+done
-# Save the original args to write them into config.status later.
-configure_args="$*"
+if test -r "$cache_file"; then
+ echo "loading cache $cache_file"
+ . $cache_file
+else
+ 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-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+
+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_n= ac_c='\c' ac_t=
+fi
-#
-# Look for various header files
-#
-echo checking for stdlib.h
-echo checking how to run the C preprocessor
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+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="${IFS}:"
+ for ac_dir in $PATH; 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"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+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="${IFS}:"
+ ac_prog_rejected=no
+ for ac_dir in $PATH; 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 $# -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" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+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:620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+else
+ ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+ if test "${CFLAGS+set}" != set; then
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ ac_cv_prog_gcc_g=yes
+else
+ ac_cv_prog_gcc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+ if test $ac_cv_prog_gcc_g = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-O2"
+ fi
+ fi
+else
+ GCC=
+ test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
if test -z "$CPP"; then
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and ``${CC-cc}'' will simply confuse
- # make. It must be expanded now.
+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"
- cat > conftest.c <<EOF
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+#line 672 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+#line 687 "configure"
#include "confdefs.h"
-#include <stdio.h>
+#include <assert.h>
Syntax Error
EOF
-err=`eval "($CPP conftest.c >/dev/null) 2>&1"`
-if test -z "$err"; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
:
else
+ echo "$ac_err" >&5
rm -rf conftest*
CPP=/lib/cpp
fi
rm -f conftest*
fi
-test ".${verbose}" != "." && echo " setting CPP to $CPP"
+rm -f conftest*
+ ac_cv_prog_CPP="$CPP"
+fi
+ CPP="$ac_cv_prog_CPP"
+else
+ ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+
-cat > conftest.c <<EOF
+#
+# Look for various header files
+#
+ac_safe=`echo "stdlib.h" | tr './\055' '___'`
+echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6
+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 724 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
-err=`eval "($CPP conftest.c >/dev/null) 2>&1"`
-if test -z "$err"; then
- :
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
-
-{
-test -n "$verbose" && \
-echo " defining NO_STDLIB_H"
-echo "#define" NO_STDLIB_H 1 >> confdefs.h
-DEFS="$DEFS -DNO_STDLIB_H=1"
-SEDDEFS="${SEDDEFS}\${SEDdA}NO_STDLIB_H\${SEDdB}NO_STDLIB_H\${SEDdC}1\${SEDdD}
-\${SEDuA}NO_STDLIB_H\${SEDuB}NO_STDLIB_H\${SEDuC}1\${SEDuD}
-\${SEDeA}NO_STDLIB_H\${SEDeB}NO_STDLIB_H\${SEDeC}1\${SEDeD}
-"
-}
-
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_STDLIB_H 1
+EOF
+
+fi
#
# Look for various functions
#
-echo checking for strcmp
-cat > conftest.c <<EOF
+echo $ac_n "checking for strcmp""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_strcmp'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 761 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { exit(0); }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char strcmp(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strcmp();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_strcmp) || defined (__stub___strcmp)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char strcmp(); strcmp();
+strcmp();
#endif
- }
+
+; return 0; }
EOF
-if eval $compile; then
+if { (eval echo configure:785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- {
-test -n "$verbose" && \
-echo " defining HAVE_STRCMP"
-echo "#define" HAVE_STRCMP 1 >> confdefs.h
-DEFS="$DEFS -DHAVE_STRCMP=1"
-SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_STRCMP\${SEDdB}HAVE_STRCMP\${SEDdC}1\${SEDdD}
-\${SEDuA}HAVE_STRCMP\${SEDuB}HAVE_STRCMP\${SEDuC}1\${SEDuD}
-\${SEDeA}HAVE_STRCMP\${SEDeB}HAVE_STRCMP\${SEDeC}1\${SEDeD}
-"
-}
+ eval "ac_cv_func_strcmp=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_func_strcmp=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'strcmp`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_STRCMP 1
+EOF
+else
+ echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
#
# Output Makefile with substitutions
-# Set default prefixes.
-if test -n "$prefix"; then
- test -z "$exec_prefix" && exec_prefix='${prefix}'
- prsub="s%^prefix\\([ ]*\\)=\\([ ]*\\).*$%prefix\\1=\\2$prefix%"
-fi
-if test -n "$exec_prefix"; then
- prsub="$prsub
-s%^exec_prefix\\([ ]*\\)=\\([ ]*\\).*$%exec_prefix\\1=\\2$exec_prefix%"
-fi
-# Quote sed substitution magic chars in DEFS.
-cat >conftest.def <<EOF
-$DEFS
-EOF
-escape_ampersand_and_backslash='s%[&\\]%\\&%g'
-DEFS=`sed "$escape_ampersand_and_backslash" <conftest.def`
-rm -f conftest.def
-# Substitute for predefined variables.
-
-trap 'rm -f config.status; exit 1' 1 3 15
-echo creating config.status
-rm -f config.status
-cat > config.status <<EOF
-#!/bin/sh
+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. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# 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.
+#
+EOF
+# 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 |
+ sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+ >> confcache
+if cmp -s $cache_file confcache; then
+ :
+else
+ if test -w $cache_file; then
+ 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}'
+
+# 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[ ]*=[^:]*$/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}
+
+echo creating $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
+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 $configure_args
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
-for arg
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
do
- case "\$arg" in
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo running \${CONFIG_SHELL-/bin/sh} $0 $configure_args
- exec \${CONFIG_SHELL-/bin/sh} $0 $configure_args ;;
- *) echo "Usage: config.status --recheck" 2>&1; exit 1 ;;
+ case "\$ac_option" in
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ 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.10"
+ exit 0 ;;
+ -help | --help | --hel | --he | --h)
+ echo "\$ac_cs_usage"; exit 0 ;;
+ *) echo "\$ac_cs_usage"; exit 1 ;;
esac
done
-trap 'rm -fr Makefile calc.h conftest*; exit 1' 1 3 15
-CPP='$CPP'
-LIBS='$LIBS'
-srcdir='$srcdir'
-prefix='$prefix'
-exec_prefix='$exec_prefix'
-prsub='$prsub'
-extrasub='$extrasub'
-EOF
-cat >> config.status <<\EOF
-
-top_srcdir=$srcdir
-
-CONFIG_FILES=${CONFIG_FILES-"Makefile"}
-for file in .. ${CONFIG_FILES}; do if test "x$file" != x..; then
- srcdir=$top_srcdir
- # Remove last slash and all that follows it. Not all systems have dirname.
- dir=`echo $file|sed 's%/[^/][^/]*$%%'`
- if test "$dir" != "$file"; then
- test "$top_srcdir" != . && srcdir=$top_srcdir/$dir
- test ! -d $dir && mkdir $dir
- fi
- echo creating $file
- rm -f $file
- echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file
- sed -e "
-$prsub
+ac_given_srcdir=$srcdir
+
+trap 'rm -fr `echo "Makefile calc.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# 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%@CPP@%$CPP%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%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%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
+s%@mandir@%$mandir%g
+s%@CC@%$CC%g
+s%@CPP@%$CPP%g
+
+CEOF
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ # Support "outfile[:infile]", defaulting infile="outfile.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
+
+ # Adjust relative srcdir, etc. for subdirectories.
+
+ # 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'`
+ else
+ ac_dir_suffix= ac_dots=
+ fi
+
+ 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.
+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
+ 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
+ sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
-s%@DEFS@%-DHAVE_CONFIG_H%" $top_srcdir/${file}.in >> $file
+s%@top_srcdir@%$top_srcdir%g
+" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
fi; done
+rm -f conftest.subs
+
+# 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='\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='\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'
CONFIG_HEADERS=${CONFIG_HEADERS-"calc.h"}
-for file in .. ${CONFIG_HEADERS}; do if test "x$file" != x..; then
-echo creating $file
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+ # Support "outfile[:infile]", defaulting infile="outfile.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
+
+ echo creating $ac_file
+
+ rm -f conftest.frag conftest.in conftest.out
+ cp $ac_given_srcdir/$ac_file_in conftest.in
-# These sed commands are put into SEDDEFS when defining a macro.
-# They are broken into pieces to make the sed script easier to manage.
-# They 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.
-# Each defining turns into a single global substitution command.
-#
-# SEDd sets the value in "#define NAME VALUE" lines.
-SEDdA='s@^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-SEDdB='\([ ][ ]*\)[^ ]*@\1#\2'
-SEDdC='\3'
-SEDdD='@g'
-# SEDu turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-SEDuA='s@^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-SEDuB='\([ ]\)@\1#\2define\3'
-SEDuC=' '
-SEDuD='\4@g'
-# SEDe turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-SEDeA='s@^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-SEDeB='$@\1#\2define\3'
-SEDeC=' '
-SEDeD='@g'
-rm -f conftest.sed
-EOF
-# Turn off quoting long enough to insert the sed commands.
-rm -f conftest.sh
-cat > conftest.sh <<EOF
-$SEDDEFS
EOF
-# Break up $SEDDEFS (now in conftest.sh) because some shells have a limit
-# on the size of here documents.
+# 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.vals <<\EOF
+s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+EOF
+
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.
# Maximum number of lines to put in a single here document.
-maxshlines=9
+ac_max_here_lines=12
+rm -f conftest.tail
while :
do
- # wc gives bogus results for an empty file on some systems.
- lines=`grep -c . conftest.sh`
- if test -z "$lines" || test "$lines" -eq 0; then break; fi
- rm -f conftest.s1 conftest.s2
- sed ${maxshlines}q conftest.sh > conftest.s1 # Like head -20.
- sed 1,${maxshlines}d conftest.sh > conftest.s2 # Like tail +21.
- # Write a limited-size here document to append to conftest.sed.
- echo 'cat >> conftest.sed <<CONFEOF' >> config.status
- cat conftest.s1 >> config.status
- echo 'CONFEOF' >> config.status
- rm -f conftest.s1 conftest.sh
- mv conftest.s2 conftest.sh
+ 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 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.sh
+rm -f conftest.vals
-# Now back to your regularly scheduled config.status.
-cat >> config.status <<\EOF
-# This sed command replaces #undef's 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 in
-# calc.h.
-cat >> conftest.sed <<\CONFEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-CONFEOF
-rm -f conftest.h
-# Break up the sed commands because old seds have small limits.
-maxsedlines=20
-cp $top_srcdir/$file.in conftest.h1
-while :
-do
- lines=`grep -c . conftest.sed`
- if test -z "$lines" || test "$lines" -eq 0; then break; fi
- rm -f conftest.s1 conftest.s2 conftest.h2
- sed ${maxsedlines}q conftest.sed > conftest.s1 # Like head -20.
- sed 1,${maxsedlines}d conftest.sed > conftest.s2 # Like tail +21.
- sed -f conftest.s1 < conftest.h1 > conftest.h2
- rm -f conftest.s1 conftest.h1 conftest.sed
- mv conftest.h2 conftest.h1
- mv conftest.s2 conftest.sed
-done
-rm -f conftest.sed conftest.h
-echo "/* $file. Generated automatically by configure. */" > conftest.h
-cat conftest.h1 >> conftest.h
-rm -f conftest.h1
-if cmp -s $file conftest.h 2>/dev/null; then
- # The file exists and we would not be changing it.
- echo "$file is unchanged"
- rm -f conftest.h
-else
- rm -f $file
- mv conftest.h $file
-fi
+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
+ # 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"
+ fi
+ rm -f $ac_file
+ mv conftest.h $ac_file
+ fi
fi; done
exit 0
EOF
-chmod +x config.status
-${CONFIG_SHELL-/bin/sh} config.status
+chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/example/calc/configure.in amiga/fsf/dejagnu/dejagnu/example/calc/configure.in
--- baseline/fsf/dejagnu/dejagnu/example/calc/configure.in Tue May 4 21:43:07 1993
+++ amiga/fsf/dejagnu/dejagnu/example/calc/configure.in Sat Sep 28 00:00:00 1996
@@ -1,5 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(calc.c)
+AC_PROG_CC
+AC_PROG_CPP
AC_CONFIG_HEADER(calc.h)
#
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/runtest amiga/fsf/dejagnu/dejagnu/runtest
--- baseline/fsf/dejagnu/dejagnu/runtest Tue Jan 4 16:58:21 1994
+++ amiga/fsf/dejagnu/dejagnu/runtest Sat Sep 28 00:00:00 1996
@@ -7,7 +7,9 @@
#
# Get the execution path to this script and the current directory.
#
-execpath=`echo ${0-.} | sed -e 's@/[^/]*$@@'`
+# The Amiga pdksh does not supply a proper $0 for force it to /ade/bin.
+#execpath=`echo ${0-.} | sed -e 's@/[^/]*$@@'`
+execpath=/ade/bin
rootme=`pwd`
#
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/tcl-mode.el amiga/fsf/dejagnu/dejagnu/tcl-mode.el
--- baseline/fsf/dejagnu/dejagnu/tcl-mode.el Tue Mar 29 17:28:56 1994
+++ amiga/fsf/dejagnu/dejagnu/tcl-mode.el Sat Sep 28 00:00:00 1996
@@ -86,7 +86,7 @@
;; set the variable tcl-help-directory to point to the topmost
;; directory containing the TclX help files. Eg:
;;
-;; (setq tcl-help-directory "/usr/local/lib/tclx/help")
+;; (setq tcl-help-directory "/ade/lib/tclx/help")
;;
;; Also you will want to add the following to your .emacs:
;;
diff -rup --new-file baseline/fsf/dejagnu/dejagnu/testsuite/runtest.all/options.exp amiga/fsf/dejagnu/dejagnu/testsuite/runtest.all/options.exp
--- baseline/fsf/dejagnu/dejagnu/testsuite/runtest.all/options.exp Tue Mar 29 18:24:24 1994
+++ amiga/fsf/dejagnu/dejagnu/testsuite/runtest.all/options.exp Sat Sep 28 00:00:00 1996
@@ -36,7 +36,6 @@ set utility [list { "" "ERROR: No tool s
{ "-v --tool xXx" "Found.*site\..*Loading.*utils\.exp" "Loading library files" } \
{ "-v --tool xXx" "Expect binary is.*Using.*main test driver" "Loading basic packages" } \
{ "-F --tool x" "Illegal Argument \"-F\"" "Bad argument" } \
- { "--tool x" "Couldn't find tool init file" "Bad tool name" } \
{ "--help" "USAGE:*" "Display help" } \
{ "-v -v -v" "Verbose is now at level 3" "Verbose set correctly" } \
{ "-V" "Expect version is.*Tcl version is.*Framework version is*" "--version" } \
diff -rup --new-file baseline/fsf/dejagnu/expect/Makefile.in amiga/fsf/dejagnu/expect/Makefile.in
--- baseline/fsf/dejagnu/expect/Makefile.in Mon Apr 11 15:29:51 1994
+++ amiga/fsf/dejagnu/expect/Makefile.in Sat Sep 28 00:00:00 1996
@@ -37,7 +37,7 @@ X11HDIR = @XINCLUDES@
# flags to pass to both cc and ld
# -O for production version
# -g for debuggable version
-CFLAGS = -g
+CFLAGS = -O
# flags to pass only to linker (after .o files but before libraries)
# If you are on a NeXT, add "-m" flag to avoid complaints about multiple strtod
@@ -49,11 +49,11 @@ CC = @CC@
# By default, `make install' will install the appropriate files in
# /usr/local/bin, /usr/local/lib, /usr/local/man, etc. You can specify
# an installation prefix other than /usr/local here:
-prefix = /usr/local
+prefix = /ade
# You can specify a separate installation prefix for architecture-specific
# files such as binaries and libraries.
-exec_prefix = /usr/local
+exec_prefix = /ade
# The following Expect scripts are not necessary to have installed as
# commands, but are very useful. Edit out what you don't want installed.
diff -rup --new-file baseline/fsf/dejagnu/expect/configure amiga/fsf/dejagnu/expect/configure
--- baseline/fsf/dejagnu/expect/configure Mon Apr 11 15:30:00 1994
+++ amiga/fsf/dejagnu/expect/configure Mon Sep 30 22:38:53 1996
@@ -1,53 +1,59 @@
-#!/bin/sh
+#! /bin/sh
+
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 1.7.9
-# Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.10
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
-# This configure script is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This script is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# Save the original args to write them into config.status later.
-ac_configure_args="$*"
-
-# Only options that might do something get documented.
-ac_usage="Usage: configure [options] [host]
-Options: [defaults in brackets]
---enable-FEATURE[=VAL] include FEATURE [VAL=yes]
---exec-prefix=PREFIX install host dependent files in PREFIX [/usr/local]
---help print this message
---prefix=PREFIX install host independent files in PREFIX [/usr/local]
---quiet, --silent do not print \`checking for...' messages
---srcdir=DIR find the sources in DIR [configure dir or ..]
---verbose print results of checks
---version print the version of autoconf that created configure
---with-PACKAGE use external PACKAGE
---without-PACKAGE do not use external PACKAGE"
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+ --with-x use the X Window System"
# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
build=NONE
-exec_prefix=
+cache_file=./config.cache
+exec_prefix=NONE
host=NONE
-norecursion=
-prefix=
-program_prefix=
-program_suffix=
-program_transform_name=
-ac_silent=
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
site=
srcdir=
target=NONE
-ac_verbose=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
ac_prev=
for ac_option
@@ -60,26 +66,52 @@ do
continue
fi
- # Accept but ignore most of the Cygnus configure options,
- # so we can diagnose typos and other invalid options.
-
case "$ac_option" in
- *=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ -*=*) 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
- -build | --build | --buil | --bui | --bu | --b)
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir="$ac_optarg" ;;
+
+ -build | --build | --buil | --bui | --bu)
ac_prev=build ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
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" ;;
+
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir="$ac_optarg" ;;
+
+ -disable-* | --disable-*)
+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+ # Reject names that are not valid shell variable names.
+ 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=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
- # Reject names that aren't valid shell variable names.
+ # Reject names that are not valid shell variable names.
if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
- echo "configure: $ac_feature: invalid feature name" >&2; exit 1
+ { 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
@@ -88,7 +120,6 @@ do
esac
eval "enable_${ac_feature}='$ac_optarg'" ;;
- # For backward compatibility, recognize -exec-prefix and --exec_prefix.
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
| --exec | --exe | --ex)
@@ -98,12 +129,66 @@ do
| --exec=* | --exe=* | --ex=*)
exec_prefix="$ac_optarg" ;;
- -gas | --gas | --ga | --g) with_gas=1 ;; # Obsolete; use --with-gas.
+ -gas | --gas | --ga | --g)
+ # Obsolete; use --with-gas.
+ with_gas=yes ;;
-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
-$ac_usage
+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]
+ --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide]
+ --psdir=DIR postscript documentation in DIR [PREFIX/ps]
+ --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi]
+ --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)
@@ -111,11 +196,76 @@ EOF
-host=* | --host=* | --hos=* | --ho=*)
host="$ac_optarg" ;;
- -nfp | --nfp | --nf) with_fp=no ;; # Obsolete; use --without-fp.
-
- -norecursion | --norecursion | --norecursio | --norecursi \
- | --norecurs | --norecur | --norecu | --norec | --nore | --nor | --no)
- norecursion=yes ;;
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir="$ac_optarg" ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir="$ac_optarg" ;;
+
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+ ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ 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" ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir="$ac_optarg" ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir="$ac_optarg" ;;
+
+ -nfp | --nfp | --nf)
+ # Obsolete; use --without-fp.
+ with_fp=no ;;
+
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c)
+ no_create=yes ;;
+
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+ no_recursion=yes ;;
+
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir="$ac_optarg" ;;
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
@@ -155,11 +305,28 @@ EOF
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
- ac_silent=yes ;;
+ silent=yes ;;
+
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir="$ac_optarg" ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir="$ac_optarg" ;;
-site | --site | --sit)
ac_prev=site ;;
- -site= | --site=* | --sit=*)
+ -site=* | --site=* | --sit=*)
site="$ac_optarg" ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
@@ -167,23 +334,30 @@ EOF
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
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" ;;
+
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
target="$ac_optarg" ;;
-v | -verbose | --verbose | --verbos | --verbo | --verb)
- ac_verbose=yes ;;
+ verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 1.7.9"
+ echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
- # Reject names that aren't valid shell variable names.
+ # Reject names that are not valid shell variable names.
if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
- echo "configure: $ac_package: invalid package name" >&2; exit 1
+ { 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
@@ -194,42 +368,95 @@ EOF
-without-* | --without-*)
ac_package=`echo $ac_option|sed -e 's/-*without-//'`
- # Reject names that aren't valid shell variable names.
+ # Reject names that are not valid shell variable names.
if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
- echo "configure: $ac_package: invalid package name" >&2; exit 1
+ { 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) with_x=1 ;; # Obsolete; use --with-x.
+ --x)
+ # Obsolete; use --with-x.
+ with_x=yes ;;
+
+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+ | --x-incl | --x-inc | --x-in | --x-i)
+ 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-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" ;;
- -*) echo "configure: warning: $ac_option: invalid option; use --help to show usage" >&2
+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
- *)
- if test -n "`echo $ac_option| sed 's/[-a-z0-9]//g'`"; then
- echo "configure: warning: $ac_option: invalid host type" >&2
+ *)
+ 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
- echo "configure: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" >&2; exit 1
+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
fi
-trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
-trap 'rm -fr confdefs* $ac_clean_files' 0
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-# Save the original args if we used an alternate arg parser.
-ac_configure_args="${ac_configure_args-$*}"
+# 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
+
+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
+ 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
# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = 'set'; then LC_ALL=C; export LC_ALL; fi
-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 "${LANG+set}" = set; then LANG=C; export LANG; fi
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
@@ -243,7 +470,7 @@ ac_unique_file=expect.h
# 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 `..'.
+ # Try the directory containing this script, then its parent.
ac_prog=$0
ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
@@ -251,126 +478,467 @@ if test -z "$srcdir"; then
if test ! -r $srcdir/$ac_unique_file; then
srcdir=..
fi
+else
+ ac_srcdir_defaulted=no
fi
if test ! -r $srcdir/$ac_unique_file; then
- if test x$ac_srcdir_defaulted = xyes; then
- echo "configure: can not find sources in ${ac_confdir} or .." >&2; exit 1
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+ else
+ { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+ fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
else
- echo "configure: can not find sources in ${srcdir}" >&2; exit 1
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi
fi
+for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+ echo "loading site script $ac_site_file"
+ . "$ac_site_file"
+ fi
+done
+
+if test -r "$cache_file"; then
+ echo "loading cache $cache_file"
+ . $cache_file
+else
+ echo "creating cache $cache_file"
+ > $cache_file
+fi
ac_ext=c
-ac_cpp='${CPP} $CFLAGS'
-ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
+# 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+
+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_n= ac_c='\c' ac_t=
+fi
+
-if test -z "$RANLIB"; then
- # Extract the first word of `ranlib', so it can be a program name with args.
- set ac_dummy ranlib; ac_word=$2
- test -n "$ac_silent" || echo "checking for $ac_word"
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_RANLIB="ranlib"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="true"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+ echo "$ac_t""$RANLIB" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+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="${IFS}:"
+ for ac_dir in $PATH; 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"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+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="${IFS}:"
+ ac_prog_rejected=no
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- RANLIB="ranlib"
+ 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 $# -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" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
fi
-test -z "$RANLIB" && RANLIB="true"
-test -n "$RANLIB" && test -n "$ac_verbose" && echo " setting RANLIB to $RANLIB"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+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:651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+else
+ ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+ if test "${CFLAGS+set}" != set; then
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ ac_cv_prog_gcc_g=yes
+else
+ ac_cv_prog_gcc_g=no
+fi
+rm -f conftest*
-CC=${CC-cc}
+fi
+echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+ if test $ac_cv_prog_gcc_g = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-O2"
+ fi
+ fi
+else
+ GCC=
+ test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
-test -n "$ac_silent" || echo "checking for pid_t in sys/types.h"
-test -n "$ac_silent" || echo "checking how to run the C preprocessor"
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
if test -z "$CPP"; then
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and ``${CC-cc}'' will simply confuse
- # make. It must be expanded now.
+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"
- cat > conftest.${ac_ext} <<EOF
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+#line 703 "configure"
#include "confdefs.h"
-#include <stdio.h>
+#include <assert.h>
Syntax Error
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
+ echo "$ac_err" >&5
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.${ac_ext} <<EOF
+ cat > conftest.$ac_ext <<EOF
+#line 718 "configure"
#include "confdefs.h"
-#include <stdio.h>
+#include <assert.h>
Syntax Error
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
+ echo "$ac_err" >&5
rm -rf conftest*
CPP=/lib/cpp
fi
rm -f conftest*
fi
rm -f conftest*
+ ac_cv_prog_CPP="$CPP"
+fi
+ CPP="$ac_cv_prog_CPP"
+else
+ ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+
+
+# If we cannot run a trivial program, we must be cross compiling.
+echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_c_cross=yes
+else
+cat > conftest.$ac_ext <<EOF
+#line 755 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+{ (eval echo configure:759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_cross=no
+else
+ ac_cv_c_cross=yes
+fi
+fi
+rm -fr conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_cross" 1>&6
+cross_compiling=$ac_cv_c_cross
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 777 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ ac_cv_header_stdc=yes
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ ac_cv_header_stdc=no
fi
-test -n "$ac_verbose" && echo " setting CPP to $CPP"
+rm -f conftest*
-echo '#include "confdefs.h"
-#include <sys/types.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "pid_t" conftest.out >/dev/null 2>&1; then
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 800 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "memchr" >/dev/null 2>&1; then
:
else
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining" pid_t to be "int"
-echo "#define" pid_t "int" >> confdefs.h
-DEFS="$DEFS -Dpid_t=int"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}pid_t\${ac_dB}pid_t\${ac_dC}int\${ac_dD}
-\${ac_uA}pid_t\${ac_uB}pid_t\${ac_uC}int\${ac_uD}
-\${ac_eA}pid_t\${ac_eB}pid_t\${ac_eC}int\${ac_eD}
-"
-}
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 818 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "free" >/dev/null 2>&1; then
+ :
+else
+ rm -rf conftest*
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+ :
+else
+cat > conftest.$ac_ext <<EOF
+#line 839 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+{ (eval echo configure:850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+fi
+rm -fr conftest*
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+ cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 874 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "pid_t" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_pid_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_pid_t=no
fi
rm -f conftest*
+fi
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+ cat >> confdefs.h <<\EOF
+#define pid_t int
+EOF
+
+fi
+
#
# On a few systems, libm.a is the same as libc.a
#
-test -n "$ac_silent" || echo "checking for sin"
-cat > conftest.${ac_ext} <<EOF
+echo $ac_n "checking for -lm""... $ac_c" 1>&6
+ac_lib_var=`echo m'_'main | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 912 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
-/* 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_sin) || defined (__stub___sin)
-choke me
-#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char sin(); sin();
-#endif
+
+int main() { t(); return 0; }
+int t() {
+main()
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- LIBS="-lm" ; test -n "$verbose" && echo " Adding -lm to library list"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo m | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lm $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
#
# Ok, lets find the tk source trees so we can use the headers
@@ -388,21 +956,36 @@ for i in `ls -d ${srcdir}/../tk* 2>/dev/
done
# if we can't find it, see if one is installed
if test x"$TKHDIR" = x ; then
- test -n "$ac_silent" || echo "checking for tk.h"
-cat > conftest.${ac_ext} <<EOF
+ ac_safe=`echo "tk.h" | tr './\055' '___'`
+echo $ac_n "checking for tk.h""... $ac_c" 1>&6
+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 966 "configure"
#include "confdefs.h"
#include <tk.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
- installed=1
-
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
- installed=0
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ installed=1
+else
+ echo "$ac_t""no" 1>&6
+installed=0
+fi
if test $installed -eq 0 ; then
TKHDIR="# no Tk directory found"
@@ -426,27 +1009,37 @@ for i in `ls -d ../tk* 2>/dev/null` ../t
done
# If not found, look for installed version
if test x"$TKLIB" = x ; then
- ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -ltk"
-ac_have_lib=""
-test -n "$ac_silent" || echo "checking for -ltk"
-cat > conftest.${ac_ext} <<EOF
+ echo $ac_n "checking for -ltk""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_tk'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ltk $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1020 "configure"
#include "confdefs.h"
-int main() { return 0; }
-int t() { main();; return 0; }
+int main() { t(); return 0; }
+int t() {
+main()
+; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- ac_have_lib="1"
-
+ ac_cv_lib_tk=yes
+else
+ rm -rf conftest*
+ ac_cv_lib_tk=no
fi
rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
- :; installed=1
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_tk" 1>&6
+if test "$ac_cv_lib_tk" = yes; then
+ installed=1
else
- :; installed=0
+ installed=0
fi
if test $installed -eq 1 ; then
@@ -486,21 +1079,36 @@ for i in `ls -d ${srcdir}/../tcl* 2>/dev
done
# if we can't find it, see if one is installed
if test x"$TCLHDIR" = x ; then
- test -n "$ac_silent" || echo "checking for tclInt.h"
-cat > conftest.${ac_ext} <<EOF
+ ac_safe=`echo "tclInt.h" | tr './\055' '___'`
+echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
+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 1089 "configure"
#include "confdefs.h"
#include <tclInt.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
- installed=1
-
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
- installed=0
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ installed=1
+else
+ echo "$ac_t""no" 1>&6
+installed=0
+fi
if test $installed -eq 0 ; then
TCLHDIR="# no Tcl directory found"
@@ -523,27 +1131,37 @@ for i in `ls -d ../tcl* 2>/dev/null` ../
done
# If not found, look for installed version
if test x"$TCLLIB" = x ; then
- ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -ltcl"
-ac_have_lib=""
-test -n "$ac_silent" || echo "checking for -ltcl"
-cat > conftest.${ac_ext} <<EOF
+ echo $ac_n "checking for -ltcl""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_tcl'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ltcl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1142 "configure"
#include "confdefs.h"
-int main() { return 0; }
-int t() { main();; return 0; }
+int main() { t(); return 0; }
+int t() {
+main()
+; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- ac_have_lib="1"
-
+ ac_cv_lib_tcl=yes
+else
+ rm -rf conftest*
+ ac_cv_lib_tcl=no
fi
rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
- :; installed=1
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_tcl" 1>&6
+if test "$ac_cv_lib_tcl" = yes; then
+ installed=1
else
- :; installed=0
+ installed=0
fi
if test $installed -eq 1 ; then
@@ -571,346 +1189,464 @@ fi
#
# Look for various header files
#
-test -n "$ac_silent" || echo "checking for sys/sysmacros.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "sys/sysmacros.h" | tr './\055' '___'`
+echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6
+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 1199 "configure"
#include "confdefs.h"
#include <sys/sysmacros.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_SYSMACROS_H"
-echo "#define" HAVE_SYSMACROS_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SYSMACROS_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SYSMACROS_H\${ac_dB}HAVE_SYSMACROS_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SYSMACROS_H\${ac_uB}HAVE_SYSMACROS_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SYSMACROS_H\${ac_eB}HAVE_SYSMACROS_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_SYSMACROS_H 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
-test -n "$ac_silent" || echo "checking for stdlib.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "stdlib.h" | tr './\055' '___'`
+echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6
+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 1232 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
- :
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_STDLIB_H"
-echo "#define" NO_STDLIB_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_STDLIB_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NO_STDLIB_H\${ac_dB}NO_STDLIB_H\${ac_dC}1\${ac_dD}
-\${ac_uA}NO_STDLIB_H\${ac_uB}NO_STDLIB_H\${ac_uC}1\${ac_uD}
-\${ac_eA}NO_STDLIB_H\${ac_eB}NO_STDLIB_H\${ac_eC}1\${ac_eD}
-"
-}
-
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_STDLIB_H 1
+EOF
+
+fi
-test -n "$ac_silent" || echo "checking for unistd.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "unistd.h" | tr './\055' '___'`
+echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
+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 1266 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_UNISTD_H"
-echo "#define" HAVE_UNISTD_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_UNISTD_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_UNISTD_H\${ac_dB}HAVE_UNISTD_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_UNISTD_H\${ac_uB}HAVE_UNISTD_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_UNISTD_H\${ac_eB}HAVE_UNISTD_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
-
-test -n "$ac_silent" || echo "checking for sys/wait.h"
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_UNISTD_H 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ac_safe=`echo "sys/wait.h" | tr './\055' '___'`
+echo $ac_n "checking for sys/wait.h""... $ac_c" 1>&6
+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 1299 "configure"
#include "confdefs.h"
#include <sys/wait.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_SYS_WAIT_H"
-echo "#define" HAVE_SYS_WAIT_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SYS_WAIT_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SYS_WAIT_H\${ac_dB}HAVE_SYS_WAIT_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SYS_WAIT_H\${ac_uB}HAVE_SYS_WAIT_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SYS_WAIT_H\${ac_eB}HAVE_SYS_WAIT_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_SYS_WAIT_H 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
-test -n "$ac_silent" || echo "checking for sys/stropts.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "sys/stropts.h" | tr './\055' '___'`
+echo $ac_n "checking for sys/stropts.h""... $ac_c" 1>&6
+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 1332 "configure"
#include "confdefs.h"
#include <sys/stropts.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_STROPTS_H"
-echo "#define" HAVE_STROPTS_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_STROPTS_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_STROPTS_H\${ac_dB}HAVE_STROPTS_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_STROPTS_H\${ac_uB}HAVE_STROPTS_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_STROPTS_H\${ac_eB}HAVE_STROPTS_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_STROPTS_H 1
+EOF
-test -n "$ac_silent" || echo "checking for sys/sysconfig.h"
-cat > conftest.${ac_ext} <<EOF
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ac_safe=`echo "sys/sysconfig.h" | tr './\055' '___'`
+echo $ac_n "checking for sys/sysconfig.h""... $ac_c" 1>&6
+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 1365 "configure"
#include "confdefs.h"
#include <sys/sysconfig.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_SYSCONF_H"
-echo "#define" HAVE_SYSCONF_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SYSCONF_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SYSCONF_H\${ac_dB}HAVE_SYSCONF_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SYSCONF_H\${ac_uB}HAVE_SYSCONF_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SYSCONF_H\${ac_eB}HAVE_SYSCONF_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_SYSCONF_H 1
+EOF
-test -n "$ac_silent" || echo "checking for sys/fcntl.h"
-cat > conftest.${ac_ext} <<EOF
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ac_safe=`echo "sys/fcntl.h" | tr './\055' '___'`
+echo $ac_n "checking for sys/fcntl.h""... $ac_c" 1>&6
+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 1398 "configure"
#include "confdefs.h"
#include <sys/fcntl.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_SYS_FCNTL_H"
-echo "#define" HAVE_SYS_FCNTL_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SYS_FCNTL_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SYS_FCNTL_H\${ac_dB}HAVE_SYS_FCNTL_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SYS_FCNTL_H\${ac_uB}HAVE_SYS_FCNTL_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SYS_FCNTL_H\${ac_eB}HAVE_SYS_FCNTL_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_SYS_FCNTL_H 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
#
# Look for various functions
#
-test -n "$ac_silent" || echo "checking for memcpy"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for memcpy""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_memcpy'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1434 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char memcpy(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char memcpy();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_memcpy) || defined (__stub___memcpy)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char memcpy(); memcpy();
+memcpy();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_memcpy=yes"
else
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining NO_MEMCPY"
-echo "#define" NO_MEMCPY "1" >> confdefs.h
-DEFS="$DEFS -DNO_MEMCPY=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NO_MEMCPY\${ac_dB}NO_MEMCPY\${ac_dC}1\${ac_dD}
-\${ac_uA}NO_MEMCPY\${ac_uB}NO_MEMCPY\${ac_uC}1\${ac_uD}
-\${ac_eA}NO_MEMCPY\${ac_eB}NO_MEMCPY\${ac_eC}1\${ac_eD}
-"
-}
-
+ eval "ac_cv_func_memcpy=no"
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for waitpid"
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'memcpy`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_MEMCPY 1
+EOF
+
+fi
+
+echo $ac_n "checking for waitpid""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_waitpid'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1484 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char waitpid(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char waitpid();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_waitpid) || defined (__stub___waitpid)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char waitpid(); waitpid();
+waitpid();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_waitpid=yes"
else
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining NOWAITPID"
-echo "#define" NOWAITPID "1" >> confdefs.h
-DEFS="$DEFS -DNOWAITPID=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NOWAITPID\${ac_dB}NOWAITPID\${ac_dC}1\${ac_dD}
-\${ac_uA}NOWAITPID\${ac_uB}NOWAITPID\${ac_uC}1\${ac_uD}
-\${ac_eA}NOWAITPID\${ac_eB}NOWAITPID\${ac_eC}1\${ac_eD}
-"
-}
-
+ eval "ac_cv_func_waitpid=no"
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for wait4"
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'waitpid`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NOWAITPID 1
+EOF
+
+fi
+
+echo $ac_n "checking for wait4""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_wait4'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1534 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char wait4(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char wait4();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_wait4) || defined (__stub___wait4)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char wait4(); wait4();
+wait4();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining HAVE_WAIT4"
-echo "#define" HAVE_WAIT4 "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_WAIT4=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_WAIT4\${ac_dB}HAVE_WAIT4\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_WAIT4\${ac_uB}HAVE_WAIT4\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_WAIT4\${ac_eB}HAVE_WAIT4\${ac_eC}1\${ac_eD}
-"
-}
+ eval "ac_cv_func_wait4=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_func_wait4=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'wait4`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_WAIT4 1
+EOF
+else
+ echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
-test -n "$ac_silent" || echo "checking for sysconf"
-cat > conftest.${ac_ext} <<EOF
+echo $ac_n "checking for sysconf""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_sysconf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1583 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char sysconf(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char sysconf();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_sysconf) || defined (__stub___sysconf)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char sysconf(); sysconf();
+sysconf();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining HAVE_SYSCONF"
-echo "#define" HAVE_SYSCONF "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SYSCONF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SYSCONF\${ac_dB}HAVE_SYSCONF\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SYSCONF\${ac_uB}HAVE_SYSCONF\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SYSCONF\${ac_eB}HAVE_SYSCONF\${ac_eC}1\${ac_eD}
-"
-}
+ eval "ac_cv_func_sysconf=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_func_sysconf=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'sysconf`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_SYSCONF 1
+EOF
+else
+ echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
echo checking to see if wait expects union
-test -n "$ac_silent" || echo "checking for union wait"
-cat > conftest.${ac_ext} <<EOF
+echo "checking for union wait" 1>&6
+cat > conftest.$ac_ext <<EOF
+#line 1631 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
-int main() { return 0; }
-int t() {
+int main() { t(); return 0; }
+int t() {
+
union wait x;
WIFEXITED(x); /* Generates compiler error if WIFEXITED
* uses an int. */
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
:
else
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_UNION_WAIT"
-echo "#define" NO_UNION_WAIT "1" >> confdefs.h
-DEFS="$DEFS -DNO_UNION_WAIT=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NO_UNION_WAIT\${ac_dB}NO_UNION_WAIT\${ac_dC}1\${ac_dD}
-\${ac_uA}NO_UNION_WAIT\${ac_uB}NO_UNION_WAIT\${ac_uC}1\${ac_uD}
-\${ac_eA}NO_UNION_WAIT\${ac_eB}NO_UNION_WAIT\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define NO_UNION_WAIT 1
+EOF
fi
rm -f conftest*
@@ -926,44 +1662,30 @@ rm -f conftest*
# Pattern matching on int could be loosened.
# Can't use ac_header_egrep since that doesn't see prototypes with K&R cpp.
echo checking mask type of select
-if egrep "select\(size_t, int" /usr/include/sys/time.h >/dev/null 2>&1; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining" SELECT_MASK_TYPE to be "int"
-echo "#define" SELECT_MASK_TYPE "int" >> confdefs.h
-DEFS="$DEFS -DSELECT_MASK_TYPE=int"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SELECT_MASK_TYPE\${ac_dB}SELECT_MASK_TYPE\${ac_dC}int\${ac_dD}
-\${ac_uA}SELECT_MASK_TYPE\${ac_uB}SELECT_MASK_TYPE\${ac_uC}int\${ac_uD}
-\${ac_eA}SELECT_MASK_TYPE\${ac_eB}SELECT_MASK_TYPE\${ac_eC}int\${ac_eD}
-"
-}
+if egrep "select\(size_t, int" /ade/include/sys/time.h >/dev/null 2>&1; then
+ cat >> confdefs.h <<\EOF
+#define SELECT_MASK_TYPE int
+EOF
fi
# Check for the data type of the function used in signal(). This
# must be before the test for rearming.
echo checking return type of signal handlers
-echo '#include "confdefs.h"
-#include <signal.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "(void|sighandler_t).*signal" conftest.out >/dev/null 2>&1; then
+cat > conftest.$ac_ext <<EOF
+#line 1677 "configure"
+#include "confdefs.h"
+#include <signal.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(void|sighandler_t).*signal" >/dev/null 2>&1; then
rm -rf conftest*
retsigtype=void
-
else
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining" RETSIGTYPE to be "int"
-echo "#define" RETSIGTYPE "int" >> confdefs.h
-DEFS="$DEFS -DRETSIGTYPE=int"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}RETSIGTYPE\${ac_dB}RETSIGTYPE\${ac_dC}int\${ac_dD}
-\${ac_uA}RETSIGTYPE\${ac_uB}RETSIGTYPE\${ac_uC}int\${ac_uD}
-\${ac_eA}RETSIGTYPE\${ac_eB}RETSIGTYPE\${ac_eC}int\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define RETSIGTYPE int
+EOF
retsigtype=int
fi
rm -f conftest*
@@ -972,7 +1694,11 @@ rm -f conftest*
# FIXME: check to see if alarm exists
# Check to see it signals need to be re-armed after use.
echo checking to see if signals need to be re-armed
-cat > conftest.${ac_ext} <<EOF
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 1702 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -999,23 +1725,16 @@ main()
exit((counter==2)?0:1);
}
EOF
-eval $ac_compile
+{ (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
-
-{
-test -n "$ac_verbose" && \
-echo " defining REARM_SIG"
-echo "#define" REARM_SIG "1" >> confdefs.h
-DEFS="$DEFS -DREARM_SIG=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}REARM_SIG\${ac_dB}REARM_SIG\${ac_dC}1\${ac_dD}
-\${ac_uA}REARM_SIG\${ac_uB}REARM_SIG\${ac_uC}1\${ac_uD}
-\${ac_eA}REARM_SIG\${ac_eB}REARM_SIG\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define REARM_SIG 1
+EOF
fi
+fi
rm -fr conftest*
# HPUX7 has trouble with the big cat so split it
@@ -1027,17 +1746,9 @@ cat >> conftest.sed <<CONFEOF
echo checking to see if stty reads from stdin or stdout
/bin/stty > /dev/null 2> /dev/null
if test $? -ne 0 ; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining STTY_READS_STDOUT"
-echo "#define" STTY_READS_STDOUT "1" >> confdefs.h
-DEFS="$DEFS -DSTTY_READS_STDOUT=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}STTY_READS_STDOUT\${ac_dB}STTY_READS_STDOUT\${ac_dC}1\${ac_dD}
-\${ac_uA}STTY_READS_STDOUT\${ac_uB}STTY_READS_STDOUT\${ac_uC}1\${ac_uD}
-\${ac_eA}STTY_READS_STDOUT\${ac_eB}STTY_READS_STDOUT\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define STTY_READS_STDOUT 1
+EOF
fi
@@ -1048,206 +1759,222 @@ fi
echo checking for HP style pty allocation
# following test fails on DECstations and other things that don't grok -c
# but that's ok, since they don't have PTYMs anyway
-if test -c /dev/ptym/ptyp0 2>>/dev/null ; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_PTYM"
-echo "#define" HAVE_PTYM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PTYM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PTYM\${ac_dB}HAVE_PTYM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PTYM\${ac_uB}HAVE_PTYM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PTYM\${ac_eB}HAVE_PTYM\${ac_eC}1\${ac_eD}
-"
-}
+if test -c /ade/dev/ptym/ptyp0 2>>/dev/null ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTYM 1
+EOF
fi
echo checking for HP style pty-trapping
-echo '#include "confdefs.h"
-#include <sys/ptyio.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "struct.*request_info" conftest.out >/dev/null 2>&1; then
+cat > conftest.$ac_ext <<EOF
+#line 1772 "configure"
+#include "confdefs.h"
+#include <sys/ptyio.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "struct.*request_info" >/dev/null 2>&1; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_PTYTRAP"
-echo "#define" HAVE_PTYTRAP "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PTYTRAP=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PTYTRAP\${ac_dB}HAVE_PTYTRAP\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PTYTRAP\${ac_uB}HAVE_PTYTRAP\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PTYTRAP\${ac_eB}HAVE_PTYTRAP\${ac_eC}1\${ac_eD}
-"
-}
-
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTYTRAP 1
+EOF
fi
rm -f conftest*
echo checking for AIX new-style pty allocation
-if test -r /dev/ptc -a -r /dev/pts ; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_PTC_PTS"
-echo "#define" HAVE_PTC_PTS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PTC_PTS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PTC_PTS\${ac_dB}HAVE_PTC_PTS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PTC_PTS\${ac_uB}HAVE_PTC_PTS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PTC_PTS\${ac_eB}HAVE_PTC_PTS\${ac_eC}1\${ac_eD}
-"
-}
+if test -r /ade/dev/ptc -a -r /ade/dev/pts ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTC_PTS 1
+EOF
fi
echo checking for SGI old-style pty allocation
-if test -r /dev/ptc -a ! -r /dev/pts ; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_PTC"
-echo "#define" HAVE_PTC "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PTC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PTC\${ac_dB}HAVE_PTC\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PTC\${ac_uB}HAVE_PTC\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PTC\${ac_eB}HAVE_PTC\${ac_eC}1\${ac_eD}
-"
-}
+if test -r /ade/dev/ptc -a ! -r /ade/dev/pts ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTC 1
+EOF
fi
echo checking for SVR4 style pty allocation
-if test -r /dev/ptmx ; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_PTMX"
-echo "#define" HAVE_PTMX "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PTMX=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PTMX\${ac_dB}HAVE_PTMX\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PTMX\${ac_uB}HAVE_PTMX\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PTMX\${ac_eB}HAVE_PTMX\${ac_eC}1\${ac_eD}
-"
-}
+if test -r /ade/dev/ptmx ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTMX 1
+EOF
# aargg. Some systems need libpt.a to use /dev/ptmx
echo checking for libpt.a
- test -n "$ac_silent" || echo "checking for ptsname"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+ echo $ac_n "checking for ptsname""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_ptsname'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1816 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char ptsname(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char ptsname();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_ptsname) || defined (__stub___ptsname)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char ptsname(); ptsname();
+ptsname();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_ptsname=yes"
else
rm -rf conftest*
- LIBS="${LIBS} -lpt"
+ eval "ac_cv_func_ptsname=no"
fi
rm -f conftest*
fi
+if eval "test \"`echo '$ac_cv_func_'ptsname`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+LIBS="${LIBS} -lpt"
+fi
+
+fi
# In OSF/1 case, SVR4 are somewhat different.
# Gregory Depp <depp@osf.org> 17Aug93
echo checking for OSF/1 style pty allocation
-if test -r /dev/ptmx_bsd ; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_PTMX_BSD"
-echo "#define" HAVE_PTMX_BSD "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PTMX_BSD=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PTMX_BSD\${ac_dB}HAVE_PTMX_BSD\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PTMX_BSD\${ac_uB}HAVE_PTMX_BSD\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PTMX_BSD\${ac_eB}HAVE_PTMX_BSD\${ac_eC}1\${ac_eD}
-"
-}
+if test -r /ade/dev/ptmx_bsd ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTMX_BSD 1
+EOF
fi
tcgetattr=0
tcsetattr=0
-test -n "$ac_silent" || echo "checking for tcgetattr"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for tcgetattr""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_tcgetattr'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1878 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char tcgetattr(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char tcgetattr();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_tcgetattr) || defined (__stub___tcgetattr)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char tcgetattr(); tcgetattr();
+tcgetattr();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- tcgetattr=1
-
+ eval "ac_cv_func_tcgetattr=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_func_tcgetattr=no"
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for tcsetattr"
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'tcgetattr`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ tcgetattr=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for tcsetattr""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_tcsetattr'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1924 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char tcsetattr(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char tcsetattr();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_tcsetattr) || defined (__stub___tcsetattr)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char tcsetattr(); tcsetattr();
+tcsetattr();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- tcsetattr=1
-
+ eval "ac_cv_func_tcsetattr=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_func_tcsetattr=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'tcsetattr`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ tcsetattr=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+
if test $tcgetattr -eq 1 -a $tcsetattr -eq 1 ; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining POSIX"
-echo "#define" POSIX "1" >> confdefs.h
-DEFS="$DEFS -DPOSIX=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}POSIX\${ac_dB}POSIX\${ac_dC}1\${ac_dD}
-\${ac_uA}POSIX\${ac_uB}POSIX\${ac_uC}1\${ac_uD}
-\${ac_eA}POSIX\${ac_eB}POSIX\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define POSIX 1
+EOF
fi
# first check for the pure bsd
echo checking for struct sgttyb
-cat > conftest.${ac_ext} <<EOF
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 1978 "configure"
#include "confdefs.h"
#include <sgtty.h>
main()
@@ -1256,21 +1983,13 @@ main()
exit(0);
}
EOF
-eval $ac_compile
+{ (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_SGTTYB"
-echo "#define" HAVE_SGTTYB "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SGTTYB=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SGTTYB\${ac_dB}HAVE_SGTTYB\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SGTTYB\${ac_uB}HAVE_SGTTYB\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SGTTYB\${ac_eB}HAVE_SGTTYB\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define HAVE_SGTTYB 1
+EOF
PTY_TYPE=sgttyb
-
+fi
fi
rm -fr conftest*
@@ -1279,7 +1998,11 @@ rm -fr conftest*
# since that just controls which of pty_XXXX.c file is use and
# pty_termios.c is set up to handle pty_termio.
echo checking for struct termio
-cat > conftest.${ac_ext} <<EOF
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 2006 "configure"
#include "confdefs.h"
#include <termio.h>
main()
@@ -1288,27 +2011,23 @@ main()
exit(0);
}
EOF
-eval $ac_compile
+{ (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_TERMIO"
-echo "#define" HAVE_TERMIO "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TERMIO=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TERMIO\${ac_dB}HAVE_TERMIO\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TERMIO\${ac_uB}HAVE_TERMIO\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TERMIO\${ac_eB}HAVE_TERMIO\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define HAVE_TERMIO 1
+EOF
PTY_TYPE=termios
-
+fi
fi
rm -fr conftest*
# now check for the new style ttys (not yet posix)
echo checking for struct termios
-cat > conftest.${ac_ext} <<EOF
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 2031 "configure"
#include "confdefs.h"
#include <termios.h>
main()
@@ -1317,28 +2036,24 @@ main()
exit(0);
}
EOF
-eval $ac_compile
+{ (eval echo configure:2040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_TERMIOS"
-echo "#define" HAVE_TERMIOS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TERMIOS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TERMIOS\${ac_dB}HAVE_TERMIOS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TERMIOS\${ac_uB}HAVE_TERMIOS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TERMIOS\${ac_eB}HAVE_TERMIOS\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define HAVE_TERMIOS 1
+EOF
PTY_TYPE=termios
-
+fi
fi
rm -fr conftest*
# finally check for Cray style ttys
echo checking for Cray-style ptys
SETUID="@:"
-cat > conftest.${ac_ext} <<EOF
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 2057 "configure"
#include "confdefs.h"
main(){
@@ -1350,10 +2065,10 @@ main(){
}
EOF
-eval $ac_compile
+{ (eval echo configure:2069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
PTY_TYPE=unicos SETUID="chmod u+s"
-
+fi
fi
rm -fr conftest*
#
@@ -1362,54 +2077,98 @@ rm -fr conftest*
#
select=0
poll=0
-test -n "$ac_silent" || echo "checking for select"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for select""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_select'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2086 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char select(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char select();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_select) || defined (__stub___select)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char select(); select();
+select();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- select=1
-
+ eval "ac_cv_func_select=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_func_select=no"
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for poll"
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'select`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ select=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for poll""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_poll'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2132 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char poll(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char poll();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_poll) || defined (__stub___poll)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char poll(); poll();
+poll();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- poll=1
-
+ eval "ac_cv_func_poll=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_func_poll=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'poll`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ poll=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+
if test $select -eq 1 ; then
EVENT_TYPE=select
test -n "$verbose" && echo " found select"
@@ -1419,94 +2178,116 @@ elif test $poll -eq 1 ; then
else
EVENT_TYPE=simple
test -n "$verbose" && echo " using simple"
-
-{
-test -n "$ac_verbose" && \
-echo " defining SIMPLE_EVENT"
-echo "#define" SIMPLE_EVENT "1" >> confdefs.h
-DEFS="$DEFS -DSIMPLE_EVENT=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SIMPLE_EVENT\${ac_dB}SIMPLE_EVENT\${ac_dC}1\${ac_dD}
-\${ac_uA}SIMPLE_EVENT\${ac_uB}SIMPLE_EVENT\${ac_uC}1\${ac_uD}
-\${ac_eA}SIMPLE_EVENT\${ac_eB}SIMPLE_EVENT\${ac_eC}1\${ac_eD}
-"
-}
+ cat >> confdefs.h <<\EOF
+#define SIMPLE_EVENT 1
+EOF
fi
for ac_func in getpty
do
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-test -n "$ac_silent" || echo "checking for ${ac_func}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+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 2195 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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})
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char ${ac_func}(); ${ac_func}();
+$ac_func();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining ${ac_tr_func}"
-echo "#define" ${ac_tr_func} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_func}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_func}\${ac_dB}${ac_tr_func}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_func}\${ac_uB}${ac_tr_func}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_func}\${ac_eB}${ac_tr_func}\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_func_$ac_func=yes"
+else
+ 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
for ac_func in _getpty
do
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-test -n "$ac_silent" || echo "checking for ${ac_func}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+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 2248 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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})
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char ${ac_func}(); ${ac_func}();
+$ac_func();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining ${ac_tr_func}"
-echo "#define" ${ac_tr_func} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_func}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_func}\${ac_dB}${ac_tr_func}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_func}\${ac_uB}${ac_tr_func}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_func}\${ac_eB}${ac_tr_func}\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_func_$ac_func=yes"
+else
+ 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
@@ -1516,66 +2297,78 @@ done
#
if test "ISC_${ISC}" = "ISC_1" ; then
# if on ISC check for -linet and add -linet to LIBS
- ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -linet"
-ac_have_lib=""
-test -n "$ac_silent" || echo "checking for -linet"
-cat > conftest.${ac_ext} <<EOF
+ echo $ac_n "checking for -linet""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-linet $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2308 "configure"
#include "confdefs.h"
-int main() { return 0; }
-int t() { main();; return 0; }
+int main() { t(); return 0; }
+int t() {
+main()
+; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- ac_have_lib="1"
-
+ ac_cv_lib_inet=yes
+else
+ rm -rf conftest*
+ ac_cv_lib_inet=no
fi
rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_LIBINET"
-echo "#define" HAVE_LIBINET "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBINET=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBINET\${ac_dB}HAVE_LIBINET\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBINET\${ac_uB}HAVE_LIBINET\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBINET\${ac_eB}HAVE_LIBINET\${ac_eC}1\${ac_eD}
-"
-}
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_inet" 1>&6
+if test "$ac_cv_lib_inet" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_LIBINET 1
+EOF
+
+ LIBS="-linet $LIBS"
- LIBS="${LIBS} -linet"
fi
# if on ISC we need <sys/bsdtypes.h> to get FD_SET macros
for ac_hdr in sys/bsdtypes.h
do
-ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
-test -n "$ac_silent" || echo "checking for ${ac_hdr}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <${ac_hdr}>
-EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+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 2346 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining ${ac_tr_hdr}"
-echo "#define" ${ac_tr_hdr} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_hdr}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_hdr}\${ac_dB}${ac_tr_hdr}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_hdr}\${ac_uB}${ac_tr_hdr}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_hdr}\${ac_eB}${ac_tr_hdr}\${ac_eC}1\${ac_eD}
-"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
done
fi
@@ -1584,172 +2377,235 @@ fi
# Look for X11
#
-# If we find X, set shell vars x_includes and x_libraries to the paths.
-no_x=true
-test -n "$ac_silent" || echo "checking for X include and library files with xmkmf"
+# If we find X, set shell vars x_includes and x_libraries to the
+# paths, otherwise set no_x=yes.
+# Uses ac_ vars as temps to allow command line to override cache and checks.
+# --without-x overrides everything else, but does not touch the cache.
+echo $ac_n "checking for X""... $ac_c" 1>&6
+
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+ withval="$with_x"
+ :
+fi
+
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
+ have_x=disabled
+else
+ if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+ # Both variables are already set.
+ have_x=yes
+ else
+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=NO ac_x_libraries=NO
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
+ # Make sure to not put "make" in the Imakefile rules, since we grep it out.
cat > Imakefile <<'EOF'
acfindx:
- @echo 'ac_imake_incroot="$(INCROOT)"; ac_imake_usrlibdir="$(USRLIBDIR)"; ac_imake_libdir="$(LIBDIR)"'
+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
EOF
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- no_x=
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `make acfindx 2>/dev/null | grep -v make`
+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- if test ! -f $ac_imake_usrlibdir/libX11.a && test -f $ac_imake_libdir/libX11.a; then
- ac_imake_usrlibdir=$ac_imake_libdir
- fi
- case "$ac_imake_incroot" in
- /usr/include) ;;
- *) x_includes="$ac_imake_incroot" ;;
+ for ac_extension in a so sl; do
+ if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+ test -f $ac_im_libdir/libX11.$ac_extension; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+ fi
+ done
+ # Screen out bogus values from the imake configuration.
+ case "$ac_im_incroot" in
+ /ade/include) ;;
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
esac
- case "$ac_imake_usrlibdir" in
- /usr/lib | /lib) ;;
- *) x_libraries="$ac_imake_usrlibdir" ;;
+ case "$ac_im_usrlibdir" in
+ /ade/lib) ;;
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
esac
fi
cd ..
+ # AmigaOS hack - give lock on conftestdir time to expire before rm -fr.
+ sleep 2
rm -fr conftestdir
fi
-if test -z "$ac_imake_usrlibdir"; then
-test -n "$ac_silent" || echo "checking for X include and library files directly"
-if test ".$x_direct_test_library" = . ; then
- x_direct_test_library='Xt'
-fi
-if test ".$x_direct_test_include" = . ; then
- x_direct_test_include='X11/Intrinsic.h'
-fi
-cat > conftest.${ac_ext} <<EOF
+if test "$ac_x_includes" = NO; then
+ # Guess where to find include files, by looking for this one X11 .h file.
+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+
+ # First, try using that file with no special directory specified.
+cat > conftest.$ac_ext <<EOF
+#line 2447 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
- no_x=
-
+ # We can compile using X headers with no special include directory.
+ac_x_includes=
else
+ echo "$ac_err" >&5
rm -rf conftest*
+ # Look for the header file in a standard set of common directories.
for ac_dir in \
- /usr/X11R6/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
+ /ade/X11R6/include \
+ /ade/X11R5/include \
+ /ade/X11R4/include \
\
- /usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
+ /ade/include/X11R6 \
+ /ade/include/X11R5 \
+ /ade/include/X11R4 \
\
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
+ /local/X11R6/include \
+ /local/X11R5/include \
+ /local/X11R4/include \
\
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
+ /local/include/X11R6 \
+ /local/include/X11R5 \
+ /local/include/X11R4 \
\
- /usr/X11/include \
- /usr/include/X11 \
- /usr/local/X11/include \
- /usr/local/include/X11 \
+ /ade/X11/include \
+ /ade/include/X11 \
+ /local/X11/include \
+ /local/include/X11 \
\
- /usr/openwin/include \
- /usr/openwin/share/include \
+ /ade/X386/include \
+ /ade/x386/include \
+ /ade/XFree86/include/X11 \
\
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
+ /ade/include \
+ /local/include \
+ /ade/unsupported/include \
+ /ade/athena/include \
+ /local/x11r5/include \
+ /ade/lpp/Xamples/include \
\
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
+ /ade/openwin/include \
+ /ade/openwin/share/include \
; \
do
if test -r "$ac_dir/$x_direct_test_include"; then
- x_includes=$ac_dir; no_x=
+ ac_x_includes=$ac_dir
break
fi
done
fi
rm -f conftest*
+fi # $ac_x_includes = NO
+
+if test "$ac_x_libraries" = NO; then
+ # Check for the libraries.
+
+ test -z "$x_direct_test_library" && x_direct_test_library=Xt
+ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-# Check for the libraries. First see if replacing the `include' by
-# `lib' works.
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -l"$x_direct_test_library""
-ac_have_lib=""
-test -n "$ac_silent" || echo "checking for -l"$x_direct_test_library""
-cat > conftest.${ac_ext} <<EOF
+ # See if we find them without any special options.
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2519 "configure"
#include "confdefs.h"
-int main() { return 0; }
-int t() { main();; return 0; }
+int main() { t(); return 0; }
+int t() {
+${x_direct_test_function}()
+; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
- :; no_x=
+ LIBS="$ac_save_LIBS"
+# We can link X programs with no special library path.
+ac_x_libraries=
else
- :; for ac_dir in `echo "$x_includes" | sed s/include/lib/` \
- /usr/X11R6/lib \
- /usr/X11R5/lib \
- /usr/X11R4/lib \
+ rm -rf conftest*
+ LIBS="$ac_save_LIBS"
+# First see if replacing the include by lib works.
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
+ /ade/X11R6/lib \
+ /ade/X11R5/lib \
+ /ade/X11R4/lib \
\
- /usr/lib/X11R6 \
- /usr/lib/X11R5 \
- /usr/lib/X11R4 \
+ /ade/lib/X11R6 \
+ /ade/lib/X11R5 \
+ /ade/lib/X11R4 \
\
- /usr/local/X11R6/lib \
- /usr/local/X11R5/lib \
- /usr/local/X11R4/lib \
+ /local/X11R6/lib \
+ /local/X11R5/lib \
+ /local/X11R4/lib \
\
- /usr/local/lib/X11R6 \
- /usr/local/lib/X11R5 \
- /usr/local/lib/X11R4 \
+ /local/lib/X11R6 \
+ /local/lib/X11R5 \
+ /local/lib/X11R4 \
\
- /usr/X11/lib \
- /usr/lib/X11 \
- /usr/local/X11/lib \
- /usr/local/lib/X11 \
+ /ade/X11/lib \
+ /ade/lib/X11 \
+ /local/X11/lib \
+ /local/lib/X11 \
\
- /usr/openwin/lib \
- /usr/openwin/share/lib \
+ /ade/X386/lib \
+ /ade/x386/lib \
+ /ade/XFree86/lib/X11 \
\
- /usr/X386/lib \
- /usr/x386/lib \
- /usr/XFree86/lib/X11 \
+ /ade/lib \
+ /local/lib \
+ /ade/unsupported/lib \
+ /ade/athena/lib \
+ /local/x11r5/lib \
+ /ade/lpp/Xamples/lib \
\
- /usr/lib \
- /usr/local/lib \
- /usr/unsupported/lib \
- /usr/athena/lib \
- /usr/local/x11r5/lib \
- /usr/lpp/Xamples/lib \
+ /ade/openwin/lib \
+ /ade/openwin/share/lib \
; \
do
for ac_extension in a so sl; do
if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
- x_libraries=$ac_dir; no_x=
+ ac_x_libraries=$ac_dir
break 2
fi
done
done
fi
+rm -f conftest*
+
+fi # $ac_x_libraries = NO
+
+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+ # Didn't find X anywhere. Cache the known absence of X.
+ ac_cv_have_x="have_x=no"
+else
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+ fi
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+if test "$have_x" != yes; then
+ echo "$ac_t""$have_x" 1>&6
+ no_x=yes
+else
+ # If each of the values was on the command line, it overrides each guess.
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+ echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
fi
-test -n "$x_includes" && test -n "$ac_verbose" && echo " found X11 headers in $x_includes"
-test -n "$x_libraries" && test -n "$ac_verbose" && echo " found X11 libraries in $x_libraries"
#
@@ -1779,27 +2635,35 @@ fi
# HP-UX wants this instead of libX11
#
if test x"$x_libraries" = x ; then
- ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lXwindow"
-ac_have_lib=""
-test -n "$ac_silent" || echo "checking for -lXwindow"
-cat > conftest.${ac_ext} <<EOF
+ echo $ac_n "checking for -lXwindow""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_Xwindow'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lXwindow $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2646 "configure"
#include "confdefs.h"
-int main() { return 0; }
-int t() { main();; return 0; }
+int main() { t(); return 0; }
+int t() {
+main()
+; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- ac_have_lib="1"
-
+ ac_cv_lib_Xwindow=yes
+else
+ rm -rf conftest*
+ ac_cv_lib_Xwindow=no
fi
rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
- :; XLIBS="-lXwindow"
-else
- :;
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_Xwindow" 1>&6
+if test "$ac_cv_lib_Xwindow" = yes; then
+ XLIBS="-lXwindow"
fi
fi
@@ -1827,15 +2691,46 @@ fi
-# Set default prefixes.
-if test -n "$prefix"; then
- test -z "$exec_prefix" && exec_prefix='${prefix}' # Let make expand it.
- ac_prsub="s%^prefix\\([ ]*\\)=\\([ ]*\\).*$%prefix\\1=\\2$prefix%"
-fi
-if test -n "$exec_prefix"; then
- ac_prsub="$ac_prsub
-s%^exec_prefix\\([ ]*\\)=\\([ ]*\\).*$%exec_prefix\\1=\\2$exec_prefix%"
+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. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# 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.
+#
+EOF
+# 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 |
+ sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+ >> confcache
+if cmp -s $cache_file confcache; then
+ :
+else
+ if test -w $cache_file; then
+ 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}'
+
# 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.
@@ -1843,36 +2738,38 @@ if test "x$srcdir" = x.; then
ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
fi
-# Quote sed substitution magic chars in DEFS.
-cat >conftest.def <<EOF
-$DEFS
-EOF
-ac_escape_ampersand_and_backslash='s%[&\\]%\\&%g'
-DEFS=`sed "$ac_escape_ampersand_and_backslash" <conftest.def`
-rm -f conftest.def
-# Substitute for predefined variables.
-
-trap 'rm -f config.status; exit 1' 1 2 15
-echo creating config.status
-rm -f config.status
-cat > config.status <<EOF
-#!/bin/sh
+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}
+
+echo creating $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
+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.
-ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]"
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
for ac_option
do
case "\$ac_option" in
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args ;;
+ 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 1.7.9"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -1880,67 +2777,44 @@ do
esac
done
-trap 'rm -fr Makefile expect_cf.h conftest*; exit 1' 1 2 15
-RANLIB='$RANLIB'
-CPP='$CPP'
-CC='$CC'
-XINCLUDES='$XINCLUDES'
-XLIBS='$XLIBS'
-XPROGS='$XPROGS'
-TCLHDIR='$TCLHDIR'
-TCLLIB='$TCLLIB'
-TKHDIR='$TKHDIR'
-TKLIB='$TKLIB'
-PTY_TYPE='$PTY_TYPE'
-EVENT_TYPE='$EVENT_TYPE'
-SETUID='$SETUID'
-LIBS='$LIBS'
-srcdir='$srcdir'
-prefix='$prefix'
-exec_prefix='$exec_prefix'
-ac_prsub='$ac_prsub'
-ac_vpsub='$ac_vpsub'
-extrasub='$extrasub'
-EOF
-cat >> config.status <<\EOF
-
-ac_top_srcdir=$srcdir
-
-CONFIG_FILES=${CONFIG_FILES-"Makefile"}
-for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then
- # 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"; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- ac_dir_suffix="/$ac_dir"
- else
- ac_dir_suffix=
- fi
+ac_given_srcdir=$srcdir
- case "$ac_top_srcdir" in
- .) srcdir=. ;;
- /*) srcdir="$ac_top_srcdir$ac_dir_suffix" ;;
- *)
- # Relative path. Prepend a "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
- srcdir="$ac_dots$ac_top_srcdir$ac_dir_suffix" ;;
- esac
+trap 'rm -fr `echo "Makefile expect_cf.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
- echo creating "$ac_file"
- rm -f "$ac_file"
- comment_str="Generated automatically from `echo $ac_file|sed 's|.*/||'`.in by configure."
- case "$ac_file" in
- *.c | *.h | *.C | *.cc | *.m ) echo "/* $comment_str */" > "$ac_file" ;;
- * ) echo "# $comment_str" > "$ac_file" ;;
- esac
- sed -e "
-$ac_prsub
+# 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%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%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%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
+s%@mandir@%$mandir%g
s%@RANLIB@%$RANLIB%g
-s%@CPP@%$CPP%g
s%@CC@%$CC%g
+s%@CPP@%$CPP%g
s%@XINCLUDES@%$XINCLUDES%g
s%@XLIBS@%$XLIBS%g
s%@XPROGS@%$XPROGS%g
@@ -1951,106 +2825,159 @@ s%@TKLIB@%$TKLIB%g
s%@PTY_TYPE@%$PTY_TYPE%g
s%@EVENT_TYPE@%$EVENT_TYPE%g
s%@SETUID@%$SETUID%g
-s%@LIBS@%$LIBS%g
+
+CEOF
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ # Support "outfile[:infile]", defaulting infile="outfile.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
+
+ # Adjust relative srcdir, etc. for subdirectories.
+
+ # 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'`
+ else
+ ac_dir_suffix= ac_dots=
+ fi
+
+ 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.
+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
+ 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
+ sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
-s%@prefix@%$prefix%g
-s%@exec_prefix@%$exec_prefix%g
-s%@DEFS@%-DHAVE_CONFIG_H%" $ac_top_srcdir/${ac_file}.in >> $ac_file
+s%@top_srcdir@%$top_srcdir%g
+" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
fi; done
+rm -f conftest.subs
-# These sed commands are put into ac_sed_defs when defining a macro.
-# They are broken into pieces to make the sed script easier to manage.
-# They 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.
-# Each defining turns into a single global substitution command.
-# Hopefully no one uses "!" as a variable value.
-# Other candidates for the sed separators, like , and @, do get used.
+# 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_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
ac_dC='\3'
-ac_dD='!g'
+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_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uB='\([ ]\)%\1#\2define\3'
ac_uC=' '
-ac_uD='\4!g'
+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_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_eB='$%\1#\2define\3'
ac_eC=' '
-ac_eD='!g'
-rm -f conftest.sed
+ac_eD='%g'
+
+CONFIG_HEADERS=${CONFIG_HEADERS-"expect_cf.h"}
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+ # Support "outfile[:infile]", defaulting infile="outfile.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
+
+ echo creating $ac_file
+
+ rm -f conftest.frag conftest.in conftest.out
+ cp $ac_given_srcdir/$ac_file_in conftest.in
+
EOF
-# Turn off quoting long enough to insert the sed commands.
-rm -f conftest.sh
-cat > conftest.sh <<EOF
-$ac_sed_defs
+
+# 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
-# Break up $ac_sed_defs (now in conftest.sh) because some shells have a limit
-# on the size of here documents.
+# 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.vals <<\EOF
+s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+EOF
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.
# Maximum number of lines to put in a single here document.
-ac_max_sh_lines=9
+ac_max_here_lines=12
+rm -f conftest.tail
while :
do
- # wc gives bogus results for an empty file on some AIX systems.
- ac_lines=`grep -c . conftest.sh`
+ 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
- rm -f conftest.s1 conftest.s2
- sed ${ac_max_sh_lines}q conftest.sh > conftest.s1 # Like head -20.
- sed 1,${ac_max_sh_lines}d conftest.sh > conftest.s2 # Like tail +21.
- # Write a limited-size here document to append to conftest.sed.
- echo 'cat >> conftest.sed <<CONFEOF' >> config.status
- cat conftest.s1 >> config.status
- echo 'CONFEOF' >> config.status
- rm -f conftest.s1 conftest.sh
- mv conftest.s2 conftest.sh
+ # 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 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.sh
-
-# Now back to your regularly scheduled config.status.
-cat >> config.status <<\EOF
-# This sed command replaces #undef's 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 in
-# expect_cf.h.
-cat >> conftest.sed <<\CONFEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-CONFEOF
-rm -f conftest.h
-# Break up the sed commands because old seds have small limits.
-ac_max_sed_lines=20
-
-CONFIG_HEADERS=${CONFIG_HEADERS-"expect_cf.h"}
-for ac_file in .. ${CONFIG_HEADERS}; do if test "x$ac_file" != x..; then
- echo creating $ac_file
+rm -f conftest.vals
- cp $ac_top_srcdir/$ac_file.in conftest.h1
- while :
- do
- ac_lines=`grep -c . conftest.sed`
- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
- rm -f conftest.s1 conftest.s2 conftest.h2
- sed ${ac_max_sed_lines}q conftest.sed > conftest.s1 # Like head -20.
- sed 1,${ac_max_sed_lines}d conftest.sed > conftest.s2 # Like tail +21.
- sed -f conftest.s1 < conftest.h1 > conftest.h2
- rm -f conftest.s1 conftest.h1 conftest.sed
- mv conftest.h2 conftest.h1
- mv conftest.s2 conftest.sed
- done
- rm -f conftest.sed conftest.h
+cat >> $CONFIG_STATUS <<\EOF
+ rm -f conftest.frag conftest.h
echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
- cat conftest.h1 >> conftest.h
- rm -f conftest.h1
+ cat conftest.in >> conftest.h
+ rm -f conftest.in
if cmp -s $ac_file conftest.h 2>/dev/null; then
- # The file exists and we would not be changing it.
echo "$ac_file is unchanged"
rm -f conftest.h
else
+ # 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"
+ fi
rm -f $ac_file
mv conftest.h $ac_file
fi
@@ -2060,6 +2987,8 @@ fi; done
exit 0
EOF
-chmod +x config.status
-${CONFIG_SHELL-/bin/sh} config.status
+chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/dejagnu/expect/configure.in amiga/fsf/dejagnu/expect/configure.in
--- baseline/fsf/dejagnu/expect/configure.in Mon Apr 11 15:30:09 1994
+++ amiga/fsf/dejagnu/expect/configure.in Sat Sep 28 00:00:00 1996
@@ -2,7 +2,8 @@ dnl Process this file with autoconf to p
AC_INIT(expect.h)
AC_CONFIG_HEADER(expect_cf.h)
AC_PROGRAM_CHECK(RANLIB, ranlib, ranlib, true)
-CC=${CC-cc}
+AC_PROG_CC
+AC_PROG_CPP
dnl AC_PROG_RANLIB
@@ -11,7 +12,7 @@ AC_PID_T
#
# On a few systems, libm.a is the same as libc.a
#
-AC_FUNC_CHECK(sin, , LIBS="-lm" ; test -n "$verbose" && echo " Adding -lm to library list")
+AC_CHECK_LIB(m, main)
#
# Ok, lets find the tk source trees so we can use the headers
# If the directory (presumably symlink) named "tk" exists, use that one
@@ -171,7 +172,7 @@ WIFEXITED(x); /* Generates compiler err
# Pattern matching on int could be loosened.
# Can't use ac_header_egrep since that doesn't see prototypes with K&R cpp.
echo checking mask type of select
-if egrep "select\(size_t, int" /usr/include/sys/time.h >/dev/null 2>&1; then
+if egrep "select\(size_t, int" /ade/include/sys/time.h >/dev/null 2>&1; then
AC_DEFINE(SELECT_MASK_TYPE, int)
fi
@@ -227,7 +228,7 @@ fi
echo checking for HP style pty allocation
# following test fails on DECstations and other things that don't grok -c
# but that's ok, since they don't have PTYMs anyway
-if test -c /dev/ptym/ptyp0 2>>/dev/null ; then
+if test -c /ade/dev/ptym/ptyp0 2>>/dev/null ; then
AC_DEFINE(HAVE_PTYM)
fi
@@ -235,17 +236,17 @@ echo checking for HP style pty-trapping
AC_HEADER_EGREP([struct.*request_info], sys/ptyio.h, AC_DEFINE(HAVE_PTYTRAP), )
echo checking for AIX new-style pty allocation
-if test -r /dev/ptc -a -r /dev/pts ; then
+if test -r /ade/dev/ptc -a -r /ade/dev/pts ; then
AC_DEFINE(HAVE_PTC_PTS)
fi
echo checking for SGI old-style pty allocation
-if test -r /dev/ptc -a ! -r /dev/pts ; then
+if test -r /ade/dev/ptc -a ! -r /ade/dev/pts ; then
AC_DEFINE(HAVE_PTC)
fi
echo checking for SVR4 style pty allocation
-if test -r /dev/ptmx ; then
+if test -r /ade/dev/ptmx ; then
AC_DEFINE(HAVE_PTMX)
# aargg. Some systems need libpt.a to use /dev/ptmx
echo checking for libpt.a
@@ -255,7 +256,7 @@ fi
# In OSF/1 case, SVR4 are somewhat different.
# Gregory Depp <depp@osf.org> 17Aug93
echo checking for OSF/1 style pty allocation
-if test -r /dev/ptmx_bsd ; then
+if test -r /ade/dev/ptmx_bsd ; then
AC_DEFINE(HAVE_PTMX_BSD)
fi
diff -rup --new-file baseline/fsf/dejagnu/expect/exp_clib.c amiga/fsf/dejagnu/expect/exp_clib.c
--- baseline/fsf/dejagnu/expect/exp_clib.c Mon Mar 28 15:35:32 1994
+++ amiga/fsf/dejagnu/expect/exp_clib.c Sat Sep 28 00:00:00 1996
@@ -17,6 +17,10 @@ would appreciate credit if this program
#else
# include <fcntl.h>
#endif
+#ifdef __amigaos__
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
#include <signal.h>
/*#include <memory.h> - deprecated - ANSI C moves them into string.h */
#include "string.h"
@@ -116,7 +120,7 @@ when trapping, see below in child half o
pipe(sync_fds);
- if ((exp_pid = fork()) == -1) return(-1);
+ if ((exp_pid = vfork()) == -1) return(-1);
if (exp_pid) {
/* parent */
close(sync_fds[1]);
@@ -173,6 +177,10 @@ when trapping, see below in child half o
/* child process - do not return from here! all errors must exit() */
+#ifdef __amigaos__
+/* setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS, 0) + 1);*/
+#endif
+
close(sync_fds[0]);
#ifdef CRAY
@@ -181,7 +189,7 @@ when trapping, see below in child half o
/* ultrix (at least 4.1-2) fails to obtain controlling tty if setsid */
/* is called. setpgrp works though. */
-#if defined(POSIX) && !defined(ultrix)
+#if defined(POSIX) && !defined(ultrix) && !defined(amiga)
#define DO_SETSID
#endif
#ifdef __convex__
@@ -855,7 +863,7 @@ exp_disconnect()
freopen("/dev/null","w",stdout);
freopen("/dev/null","w",stderr);
-#ifdef POSIX
+#if defined(POSIX) && !defined(amiga)
setsid();
#else
#ifdef SYSV3
diff -rup --new-file baseline/fsf/dejagnu/expect/exp_command.c amiga/fsf/dejagnu/expect/exp_command.c
--- baseline/fsf/dejagnu/expect/exp_command.c Mon Mar 21 17:14:08 1994
+++ amiga/fsf/dejagnu/expect/exp_command.c Sat Sep 28 00:00:00 1996
@@ -46,6 +46,10 @@ would appreciate credit if this program
#include <sys/ptyio.h>
#endif
+#ifdef __amigaos__
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
#include <math.h> /* for log/pow computation in send -h */
#include <ctype.h> /* all this for ispunct! */
@@ -548,10 +552,12 @@ char **argv;
}
stty_init = exp_get_var(interp,STTY_INIT);
+#ifndef __amigaos__
if (stty_init) {
slave_write_ioctls++;
slave_opens++;
}
+#endif
/* any extraneous ioctl's that occur in slave must be accounted for
when trapping, see below in child half of fork */
@@ -657,8 +663,8 @@ when trapping, see below in child half o
pipe(sync_fds);
- if ((pid = fork()) == -1) {
- exp_error(interp,"fork: %s",Tcl_PosixError(interp));
+ if ((pid = vfork()) == -1) {
+ exp_error(interp,"vfork: %s",Tcl_PosixError(interp));
goto parent_error;
}
@@ -769,6 +775,10 @@ parent_error:
/* child process - do not return from here! all errors must exit() */
+#ifdef __amigaos__
+/* setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS, 0) + 1);*/
+#endif
+
close(sync_fds[0]);
if (exp_dev_tty != -1) {
@@ -782,7 +792,7 @@ parent_error:
/* ultrix (at least 4.1-2) fails to obtain controlling tty if setsid */
/* is called. setpgrp works though. */
-#if defined(POSIX) && !defined(ultrix)
+#if defined(POSIX) && !defined(ultrix) && !defined(amiga)
#define DO_SETSID
#endif
#ifdef __convex__
@@ -2601,7 +2611,7 @@ char **argv;
Tcl_SetResult(interp,tcl_handle,TCL_DYNAMIC);
} else {
if (!(fp = fdopen(m,"r+"))) {
- exp_error(interp,"fork: %s",Tcl_PosixError(interp));
+ exp_error(interp,"vfork: %s",Tcl_PosixError(interp));
return TCL_ERROR;
}
Tcl_EnterFile(interp,fp,TCL_FILE_READABLE|TCL_FILE_WRITABLE);
diff -rup --new-file baseline/fsf/dejagnu/expect/exp_select.c amiga/fsf/dejagnu/expect/exp_select.c
--- baseline/fsf/dejagnu/expect/exp_select.c Mon Mar 28 15:35:47 1994
+++ amiga/fsf/dejagnu/expect/exp_select.c Sat Sep 28 00:00:00 1996
@@ -120,7 +120,7 @@ int key;
/* FIXME: This is really gross, but the folks at Lynx said their select is
* way hosed and to ignore all exceptions.
*/
-#ifdef __Lynx__
+#if defined(__Lynx__) || defined(amiga)
#define EXCEP 0
#else
#define EXCEP &excep
@@ -173,18 +173,19 @@ int key;
FD_ZERO(&excep);
for (i = 0;i < n;i++) {
FD_SET(masters[i],&rdrs);
+#ifndef amiga
FD_SET(masters[i],&excep);
+#endif
}
/* The reason all fd masks are (seemingly) redundantly cast to */
/* SELECT_MASK_TYPE is that the HP defines its mask in terms of */
/* of int * and yet defines FD_SET in terms of fd_set. */
-
- if (-1 == select(exp_fd_max+1,
+ if (-1 == (i = select(exp_fd_max+1,
(SELECT_MASK_TYPE *)&rdrs,
(SELECT_MASK_TYPE *)0,
(SELECT_MASK_TYPE *)EXCEP,
- t)) {
+ t))) {
/* window refreshes trigger EINTR, ignore */
if (errno == EINTR) goto restart;
else if (errno == EBADF) {
diff -rup --new-file baseline/fsf/dejagnu/expect/expect.c amiga/fsf/dejagnu/expect/expect.c
--- baseline/fsf/dejagnu/expect/expect.c Mon Mar 28 15:35:54 1994
+++ amiga/fsf/dejagnu/expect/expect.c Sat Sep 28 00:00:00 1996
@@ -9,6 +9,7 @@ would appreciate credit if this program
*/
#include <sys/types.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <signal.h>
#include <varargs.h>
diff -rup --new-file baseline/fsf/dejagnu/expect/install.sh amiga/fsf/dejagnu/expect/install.sh
--- baseline/fsf/dejagnu/expect/install.sh Tue Jan 4 20:57:33 1994
+++ amiga/fsf/dejagnu/expect/install.sh Sat Sep 28 00:00:00 1996
@@ -41,8 +41,10 @@ mvcmd="$mvprog"
src=""
dst=""
-while [ x"$1" != x ]; do
+while true ; do
case $1 in
+ "") break ;;
+
-c) instcmd="$cpprog"
shift
continue;;
@@ -74,12 +76,10 @@ while [ x"$1" != x ]; do
shift
continue;;
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- dst=$1
- fi
+ *) case "$src" in
+ "") src=$1 ;;
+ *) dst=$1 ;;
+ esac
shift
continue;;
esac
diff -rup --new-file baseline/fsf/dejagnu/expect/pty_termios.c amiga/fsf/dejagnu/expect/pty_termios.c
--- baseline/fsf/dejagnu/expect/pty_termios.c Mon Mar 21 17:14:56 1994
+++ amiga/fsf/dejagnu/expect/pty_termios.c Sat Sep 28 00:00:00 1996
@@ -15,6 +15,11 @@ would appreciate credit if you use this
#endif
#include "expect_cf.h"
+
+#ifdef __amigaos__
+#define HAVE_GETPTY
+#endif
+
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
@@ -75,7 +80,11 @@ static char *slave_name;
#endif
#if defined(HAVE_GETPTY)
+#ifdef __amigaos__
+#define MAXPTYNAMELEN 32
+#else
#include <sys/vty.h>
+#endif
static char master_name[MAXPTYNAMELEN];
static char slave_name[MAXPTYNAMELEN];
#endif
@@ -114,7 +123,7 @@ char *name; /* name of pty */
int pid;
old = signal(SIGCHLD, SIG_DFL);
- switch (pid = fork()) {
+ switch (pid = vfork()) {
case 0: /* child */
exec_stty("/bin/stty","/bin/stty",s);
break;
@@ -168,6 +177,7 @@ pty_stty(s,name)
char *s; /* args to stty */
char *name; /* name of pty */
{
+#ifndef __amigaos__
#define MAX_ARGLIST 10240
char buf[MAX_ARGLIST]; /* overkill is easier */
RETSIGTYPE (*old)(); /* save old sigalarm handler */
@@ -180,6 +190,7 @@ char *name; /* name of pty */
old = signal(SIGCHLD, SIG_DFL);
system(buf);
signal(SIGCHLD, old); /* restore signal handler */
+#endif
}
int exp_dev_tty; /* file descriptor to /dev/tty or -1 if none */
@@ -270,7 +281,11 @@ exp_init_pty()
#endif /* HAVE_PTYM */
+#ifdef __amigaos__
+ exp_dev_tty = -1;
+#else
exp_dev_tty = open("/dev/tty",O_RDWR);
+#endif
knew_dev_tty = (exp_dev_tty != -1);
if (knew_dev_tty) ttytype(GET_TTYTYPE,exp_dev_tty,0,0,(char *)0);
}
@@ -281,6 +296,19 @@ exp_init_pty()
#define W_OK 02
#endif
+#ifdef __amigaos__
+static int getpty(char *master, char *slave, int mode)
+{
+ static unsigned short id;
+
+ if (id == 0)
+ id = (getpid() ^ time(NULL)) & 0xffff;
+ sprintf(master, "/fifo/expect_pty%05u/rwemks", id);
+ sprintf(slave, "/fifo/expect_pty%05u/rweksc", id++);
+ return open(master, mode);
+}
+#endif
+
int
getptymaster()
{
@@ -398,6 +426,21 @@ int control; /* if 1, enable pty trappin
#endif /* HAVE_PTYTRAP */
}
+#ifdef __amigaos__
+void set_to_raw(char *slave, char *name)
+{
+ if (name == NULL)
+ return;
+ if (strstr(name, "-echo") || (strstr(name, "raw") && !strstr(name, "-raw")) || strstr(name, "-cooked"))
+ {
+ char *p = slave + strlen(slave) - 1;
+
+ if (*p == 'c')
+ *p = '\0';
+ }
+}
+#endif
+
int
getptyslave(ttycopy,ttyinit,stty_args)
int ttycopy;
@@ -407,6 +450,9 @@ char *stty_args;
int slave, slave2;
char buf[10240];
+#ifdef __amigaos__
+ set_to_raw(slave_name, stty_args);
+#endif
if (0 > (slave = open(slave_name, O_RDWR))) return(-1);
#if defined(HAVE_PTMX_BSD)
diff -rup --new-file baseline/fsf/dejagnu/expect/tests/expect.test amiga/fsf/dejagnu/expect/tests/expect.test
--- baseline/fsf/dejagnu/expect/tests/expect.test Mon Mar 21 17:15:46 1994
+++ amiga/fsf/dejagnu/expect/tests/expect.test Sat Sep 28 00:00:00 1996
@@ -10,8 +10,10 @@ catch {unset x}
log_user 0
+set stty_init raw
spawn cat -u
-stty -echo < $spawn_out(slave,name)
+set stty_init sane
+#stty -echo < $spawn_out(slave,name)
test pid-1.1 {exact pattern} {
expect "*"
diff -rup --new-file baseline/fsf/dejagnu/expect/testsuite/expect.tests/expect-tests.exp amiga/fsf/dejagnu/expect/testsuite/expect.tests/expect-tests.exp
--- baseline/fsf/dejagnu/expect/testsuite/expect.tests/expect-tests.exp Wed Mar 30 18:12:30 1994
+++ amiga/fsf/dejagnu/expect/testsuite/expect.tests/expect-tests.exp Sat Sep 28 00:00:00 1996
@@ -23,6 +23,7 @@
# the initial work on the version of these tests from the tcl release was done
# by Mary Ann May-Pumphrey of Sun Microsystems.
#
+
if $tracelevel then {
strace $tracelevel
}
@@ -65,7 +66,7 @@ expect {
pass [lindex $expect_out(0,string) 1]
exp_continue
}
- -re "\[\r\n\]*\\+* \[a-z\]*-\[.0-9\]* FAILED\[\r\n\]*" {
+ -re "\[\r\n\]*---- \[a-z\]*-\[.0-9\]* FAILED\[\r\n\]*" {
fail [lindex $expect_out(0,string) 1]
exp_continue
}
diff -rup --new-file baseline/fsf/dejagnu/manifests/bin amiga/fsf/dejagnu/manifests/bin
--- baseline/fsf/dejagnu/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/dejagnu/manifests/bin Sat Sep 28 00:00:00 1996
@@ -0,0 +1,33 @@
+COPYING
+COPYING.info
+bin/expect
+bin/m68k-amigaos-runtest
+bin/runtest
+bin/tclsh
+include/Dbg.h
+include/expect.h
+include/expect_cf.h
+include/expect_comm.h
+include/expect_tcl.h
+include/tcl.h
+lib/dejagnu/bug.exp
+lib/dejagnu/config.guess
+lib/dejagnu/debugger.exp
+lib/dejagnu/framework.exp
+lib/dejagnu/remote.exp
+lib/dejagnu/runtest.exp
+lib/dejagnu/site.exp
+lib/dejagnu/udi.exp
+lib/dejagnu/util-defs.exp
+lib/dejagnu/utils.exp
+lib/dejagnu/vrtx.exp
+lib/dejagnu/vxworks.exp
+lib/libexpect.a
+lib/libtcl.a
+lib/tcl/init.tcl
+lib/tcl/parray.tcl
+lib/tcl/tclIndex
+man/man1/configure.1
+man/man1/expect.1
+man/man1/runtest.1
+man/man3/libexpect.3
diff -rup --new-file baseline/fsf/dejagnu/manifests/src amiga/fsf/dejagnu/manifests/src
--- baseline/fsf/dejagnu/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/dejagnu/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,419 @@
+fsf/dejagnu/.cvsignore
+fsf/dejagnu/COPYING
+fsf/dejagnu/COPYING.LIB
+fsf/dejagnu/CYGNUS
+fsf/dejagnu/ChangeLog
+fsf/dejagnu/Makefile.in
+fsf/dejagnu/Product-Info
+fsf/dejagnu/README
+fsf/dejagnu/config.guess
+fsf/dejagnu/config.sub
+fsf/dejagnu/config/ChangeLog
+fsf/dejagnu/config/mh-a68bsd
+fsf/dejagnu/config/mh-aix
+fsf/dejagnu/config/mh-aix386
+fsf/dejagnu/config/mh-apollo68
+fsf/dejagnu/config/mh-decstation
+fsf/dejagnu/config/mh-delta88
+fsf/dejagnu/config/mh-dgux
+fsf/dejagnu/config/mh-hp300
+fsf/dejagnu/config/mh-hpux
+fsf/dejagnu/config/mh-irix4
+fsf/dejagnu/config/mh-irix5
+fsf/dejagnu/config/mh-linux
+fsf/dejagnu/config/mh-lynxos
+fsf/dejagnu/config/mh-lynxosrs6k
+fsf/dejagnu/config/mh-ncr3000
+fsf/dejagnu/config/mh-riscos
+fsf/dejagnu/config/mh-sco
+fsf/dejagnu/config/mh-solaris
+fsf/dejagnu/config/mh-sun
+fsf/dejagnu/config/mh-sun3
+fsf/dejagnu/config/mh-sysv
+fsf/dejagnu/config/mh-sysv4
+fsf/dejagnu/config/mh-vaxult2
+fsf/dejagnu/configure
+fsf/dejagnu/configure.in
+fsf/dejagnu/dejagnu/ChangeLog
+fsf/dejagnu/dejagnu/Makefile.in
+fsf/dejagnu/dejagnu/README
+fsf/dejagnu/dejagnu/TODO
+fsf/dejagnu/dejagnu/config/mh-linux
+fsf/dejagnu/dejagnu/config/mh-sysv4
+fsf/dejagnu/dejagnu/configure.in
+fsf/dejagnu/dejagnu/contrib/README
+fsf/dejagnu/dejagnu/contrib/test-g++
+fsf/dejagnu/dejagnu/contrib/test-target
+fsf/dejagnu/dejagnu/contrib/test-tool
+fsf/dejagnu/dejagnu/contrib/testit
+fsf/dejagnu/dejagnu/doc/.cvsignore
+fsf/dejagnu/dejagnu/doc/Makefile.in
+fsf/dejagnu/dejagnu/doc/configure.in
+fsf/dejagnu/dejagnu/doc/dejagnu.texi
+fsf/dejagnu/dejagnu/doc/expect.texi
+fsf/dejagnu/dejagnu/doc/runtest.1
+fsf/dejagnu/dejagnu/doc/tcl.texi
+fsf/dejagnu/dejagnu/example/Makefile.in
+fsf/dejagnu/dejagnu/example/calc/Makefile.in
+fsf/dejagnu/dejagnu/example/calc/calc.1
+fsf/dejagnu/dejagnu/example/calc/calc.c
+fsf/dejagnu/dejagnu/example/calc/calc.h.in
+fsf/dejagnu/dejagnu/example/calc/configure
+fsf/dejagnu/dejagnu/example/calc/configure.in
+fsf/dejagnu/dejagnu/example/calc/testsuite/calc.test/calc.exp
+fsf/dejagnu/dejagnu/example/calc/testsuite/config/unix.exp
+fsf/dejagnu/dejagnu/example/configure.in
+fsf/dejagnu/dejagnu/lib/bug.exp
+fsf/dejagnu/dejagnu/lib/debugger.exp
+fsf/dejagnu/dejagnu/lib/framework.exp
+fsf/dejagnu/dejagnu/lib/remote.exp
+fsf/dejagnu/dejagnu/lib/udi.exp
+fsf/dejagnu/dejagnu/lib/util-defs.exp
+fsf/dejagnu/dejagnu/lib/utils.exp
+fsf/dejagnu/dejagnu/lib/vrtx.exp
+fsf/dejagnu/dejagnu/lib/vxworks.exp
+fsf/dejagnu/dejagnu/runtest
+fsf/dejagnu/dejagnu/runtest.exp
+fsf/dejagnu/dejagnu/site.tmpl
+fsf/dejagnu/dejagnu/tcl-mode.el
+fsf/dejagnu/dejagnu/testsuite/Makefile.in
+fsf/dejagnu/dejagnu/testsuite/config/default.exp
+fsf/dejagnu/dejagnu/testsuite/configure.in
+fsf/dejagnu/dejagnu/testsuite/runtest.all/options.exp
+fsf/dejagnu/etc/ChangeLog
+fsf/dejagnu/etc/Makefile.in
+fsf/dejagnu/etc/cfg-paper.texi
+fsf/dejagnu/etc/configure.in
+fsf/dejagnu/etc/configure.man
+fsf/dejagnu/etc/configure.texi
+fsf/dejagnu/etc/make-stds.texi
+fsf/dejagnu/etc/srctree.texi
+fsf/dejagnu/etc/standards.texi
+fsf/dejagnu/etc/subst-strings
+fsf/dejagnu/expect/CHANGES.2to3
+fsf/dejagnu/expect/CHANGES.3to4
+fsf/dejagnu/expect/CHANGES.4to5
+fsf/dejagnu/expect/ChangeLog
+fsf/dejagnu/expect/Dbg.c
+fsf/dejagnu/expect/Dbg.h
+fsf/dejagnu/expect/FAQ
+fsf/dejagnu/expect/HISTORY
+fsf/dejagnu/expect/INSTALL
+fsf/dejagnu/expect/Makefile.in
+fsf/dejagnu/expect/README
+fsf/dejagnu/expect/configure
+fsf/dejagnu/expect/configure.in
+fsf/dejagnu/expect/example/Makefile
+fsf/dejagnu/expect/example/archie
+fsf/dejagnu/expect/example/autopasswd
+fsf/dejagnu/expect/example/chess.exp
+fsf/dejagnu/expect/example/chesslib++.c
+fsf/dejagnu/expect/example/chesslib.c
+fsf/dejagnu/expect/example/chesslib2.c
+fsf/dejagnu/expect/example/dislocate
+fsf/dejagnu/expect/example/dislocate.man
+fsf/dejagnu/expect/example/dvorak
+fsf/dejagnu/expect/example/ftp-rfc
+fsf/dejagnu/expect/example/kibitz
+fsf/dejagnu/expect/example/kibitz.man
+fsf/dejagnu/expect/example/lpunlock
+fsf/dejagnu/expect/example/passmass
+fsf/dejagnu/expect/example/passmass.man
+fsf/dejagnu/expect/example/rftp
+fsf/dejagnu/expect/example/rlogin-cwd
+fsf/dejagnu/expect/example/robohunt
+fsf/dejagnu/expect/example/rogue.exp
+fsf/dejagnu/expect/example/timed-read
+fsf/dejagnu/expect/example/timed-run
+fsf/dejagnu/expect/example/tknewsbiff
+fsf/dejagnu/expect/example/tknewsbiff.man
+fsf/dejagnu/expect/example/tkpasswd
+fsf/dejagnu/expect/example/weather
+fsf/dejagnu/expect/example/xkibitz
+fsf/dejagnu/expect/example/xkibitz.man
+fsf/dejagnu/expect/example/xpstat
+fsf/dejagnu/expect/exp_clib.c
+fsf/dejagnu/expect/exp_command.c
+fsf/dejagnu/expect/exp_command.h
+fsf/dejagnu/expect/exp_console.c
+fsf/dejagnu/expect/exp_event.h
+fsf/dejagnu/expect/exp_glob.c
+fsf/dejagnu/expect/exp_int.h
+fsf/dejagnu/expect/exp_inter.c
+fsf/dejagnu/expect/exp_log.c
+fsf/dejagnu/expect/exp_log.h
+fsf/dejagnu/expect/exp_main_exp.c
+fsf/dejagnu/expect/exp_main_sub.c
+fsf/dejagnu/expect/exp_main_tk.c
+fsf/dejagnu/expect/exp_poll.c
+fsf/dejagnu/expect/exp_printify.c
+fsf/dejagnu/expect/exp_printify.h
+fsf/dejagnu/expect/exp_prog.h
+fsf/dejagnu/expect/exp_pty.c
+fsf/dejagnu/expect/exp_pty.h
+fsf/dejagnu/expect/exp_regexp.c
+fsf/dejagnu/expect/exp_regexp.h
+fsf/dejagnu/expect/exp_rename.h
+fsf/dejagnu/expect/exp_select.c
+fsf/dejagnu/expect/exp_simple.c
+fsf/dejagnu/expect/exp_strf.c
+fsf/dejagnu/expect/exp_test.c
+fsf/dejagnu/expect/exp_tk.c
+fsf/dejagnu/expect/exp_trap.c
+fsf/dejagnu/expect/exp_tstamp.h
+fsf/dejagnu/expect/exp_tty.c
+fsf/dejagnu/expect/exp_tty.h
+fsf/dejagnu/expect/exp_tty_in.h
+fsf/dejagnu/expect/exp_win.c
+fsf/dejagnu/expect/exp_win.h
+fsf/dejagnu/expect/expect.c
+fsf/dejagnu/expect/expect.h
+fsf/dejagnu/expect/expect.man
+fsf/dejagnu/expect/expect_cf.h.in
+fsf/dejagnu/expect/expect_comm.h
+fsf/dejagnu/expect/expect_tcl.h
+fsf/dejagnu/expect/expectk.man
+fsf/dejagnu/expect/fixcat
+fsf/dejagnu/expect/fixline1
+fsf/dejagnu/expect/install.sh
+fsf/dejagnu/expect/libexpect.man
+fsf/dejagnu/expect/pty_sgttyb.c
+fsf/dejagnu/expect/pty_termios.c
+fsf/dejagnu/expect/pty_unicos.c
+fsf/dejagnu/expect/regress.ps
+fsf/dejagnu/expect/scripts.ps
+fsf/dejagnu/expect/seminal.ps
+fsf/dejagnu/expect/sysadm.ps
+fsf/dejagnu/expect/tcl-debug.ps
+fsf/dejagnu/expect/tests/README
+fsf/dejagnu/expect/tests/all
+fsf/dejagnu/expect/tests/cat.test
+fsf/dejagnu/expect/tests/defs
+fsf/dejagnu/expect/tests/expect.test
+fsf/dejagnu/expect/tests/pid.test
+fsf/dejagnu/expect/tests/spawn.test
+fsf/dejagnu/expect/tests/stty.test
+fsf/dejagnu/expect/testsuite/ChangeLog
+fsf/dejagnu/expect/testsuite/Makefile.in
+fsf/dejagnu/expect/testsuite/config/default.exp
+fsf/dejagnu/expect/testsuite/configure.in
+fsf/dejagnu/expect/testsuite/expect.tests/expect-tests.exp
+fsf/dejagnu/expect/vgrindefs
+fsf/dejagnu/install.sh
+fsf/dejagnu/manifests/bin
+fsf/dejagnu/manifests/src
+fsf/dejagnu/move-if-change
+fsf/dejagnu/tcl/ChangeLog
+fsf/dejagnu/tcl/Makefile.in
+fsf/dejagnu/tcl/README.configure
+fsf/dejagnu/tcl/changes
+fsf/dejagnu/tcl/compat/README
+fsf/dejagnu/tcl/compat/dirent.h
+fsf/dejagnu/tcl/compat/dirent2.h
+fsf/dejagnu/tcl/compat/float.h
+fsf/dejagnu/tcl/compat/getcwd.c
+fsf/dejagnu/tcl/compat/limits.h
+fsf/dejagnu/tcl/compat/opendir.c
+fsf/dejagnu/tcl/compat/stdlib.h
+fsf/dejagnu/tcl/compat/strerror.c
+fsf/dejagnu/tcl/compat/string.h
+fsf/dejagnu/tcl/compat/strstr.c
+fsf/dejagnu/tcl/compat/strtod.c
+fsf/dejagnu/tcl/compat/strtol.c
+fsf/dejagnu/tcl/compat/strtoul.c
+fsf/dejagnu/tcl/compat/tmpnam.c
+fsf/dejagnu/tcl/compat/unistd.h
+fsf/dejagnu/tcl/compat/waitpid.c
+fsf/dejagnu/tcl/configure
+fsf/dejagnu/tcl/configure.in
+fsf/dejagnu/tcl/doc/AddErrInfo.3
+fsf/dejagnu/tcl/doc/AppInit.3
+fsf/dejagnu/tcl/doc/Async.3
+fsf/dejagnu/tcl/doc/Backslash.3
+fsf/dejagnu/tcl/doc/CallDel.3
+fsf/dejagnu/tcl/doc/CmdCmplt.3
+fsf/dejagnu/tcl/doc/Concat.3
+fsf/dejagnu/tcl/doc/CrtCommand.3
+fsf/dejagnu/tcl/doc/CrtInterp.3
+fsf/dejagnu/tcl/doc/CrtMathFnc.3
+fsf/dejagnu/tcl/doc/CrtPipelin.3
+fsf/dejagnu/tcl/doc/CrtTrace.3
+fsf/dejagnu/tcl/doc/DString.3
+fsf/dejagnu/tcl/doc/DetachPids.3
+fsf/dejagnu/tcl/doc/EnterFile.3
+fsf/dejagnu/tcl/doc/Eval.3
+fsf/dejagnu/tcl/doc/ExprLong.3
+fsf/dejagnu/tcl/doc/GetInt.3
+fsf/dejagnu/tcl/doc/Hash.3
+fsf/dejagnu/tcl/doc/Interp.3
+fsf/dejagnu/tcl/doc/LinkVar.3
+fsf/dejagnu/tcl/doc/PrintDbl.3
+fsf/dejagnu/tcl/doc/RecordEval.3
+fsf/dejagnu/tcl/doc/RegExp.3
+fsf/dejagnu/tcl/doc/SetRecLmt.3
+fsf/dejagnu/tcl/doc/SetResult.3
+fsf/dejagnu/tcl/doc/SetVar.3
+fsf/dejagnu/tcl/doc/SplitList.3
+fsf/dejagnu/tcl/doc/StrMatch.3
+fsf/dejagnu/tcl/doc/Tcl.n
+fsf/dejagnu/tcl/doc/TildeSubst.3
+fsf/dejagnu/tcl/doc/TraceVar.3
+fsf/dejagnu/tcl/doc/append.n
+fsf/dejagnu/tcl/doc/array.n
+fsf/dejagnu/tcl/doc/break.n
+fsf/dejagnu/tcl/doc/case.n
+fsf/dejagnu/tcl/doc/catch.n
+fsf/dejagnu/tcl/doc/cd.n
+fsf/dejagnu/tcl/doc/close.n
+fsf/dejagnu/tcl/doc/concat.n
+fsf/dejagnu/tcl/doc/continue.n
+fsf/dejagnu/tcl/doc/eof.n
+fsf/dejagnu/tcl/doc/error.n
+fsf/dejagnu/tcl/doc/eval.n
+fsf/dejagnu/tcl/doc/exec.n
+fsf/dejagnu/tcl/doc/exit.n
+fsf/dejagnu/tcl/doc/expr.n
+fsf/dejagnu/tcl/doc/file.n
+fsf/dejagnu/tcl/doc/flush.n
+fsf/dejagnu/tcl/doc/for.n
+fsf/dejagnu/tcl/doc/foreach.n
+fsf/dejagnu/tcl/doc/format.n
+fsf/dejagnu/tcl/doc/gets.n
+fsf/dejagnu/tcl/doc/glob.n
+fsf/dejagnu/tcl/doc/global.n
+fsf/dejagnu/tcl/doc/history.n
+fsf/dejagnu/tcl/doc/if.n
+fsf/dejagnu/tcl/doc/incr.n
+fsf/dejagnu/tcl/doc/info.n
+fsf/dejagnu/tcl/doc/join.n
+fsf/dejagnu/tcl/doc/lappend.n
+fsf/dejagnu/tcl/doc/library.n
+fsf/dejagnu/tcl/doc/lindex.n
+fsf/dejagnu/tcl/doc/linsert.n
+fsf/dejagnu/tcl/doc/list.n
+fsf/dejagnu/tcl/doc/llength.n
+fsf/dejagnu/tcl/doc/lrange.n
+fsf/dejagnu/tcl/doc/lreplace.n
+fsf/dejagnu/tcl/doc/lsearch.n
+fsf/dejagnu/tcl/doc/lsort.n
+fsf/dejagnu/tcl/doc/man.macros
+fsf/dejagnu/tcl/doc/open.n
+fsf/dejagnu/tcl/doc/pid.n
+fsf/dejagnu/tcl/doc/proc.n
+fsf/dejagnu/tcl/doc/puts.n
+fsf/dejagnu/tcl/doc/pwd.n
+fsf/dejagnu/tcl/doc/read.n
+fsf/dejagnu/tcl/doc/regexp.n
+fsf/dejagnu/tcl/doc/regsub.n
+fsf/dejagnu/tcl/doc/rename.n
+fsf/dejagnu/tcl/doc/return.n
+fsf/dejagnu/tcl/doc/scan.n
+fsf/dejagnu/tcl/doc/seek.n
+fsf/dejagnu/tcl/doc/set.n
+fsf/dejagnu/tcl/doc/source.n
+fsf/dejagnu/tcl/doc/split.n
+fsf/dejagnu/tcl/doc/string.n
+fsf/dejagnu/tcl/doc/switch.n
+fsf/dejagnu/tcl/doc/tclsh.1
+fsf/dejagnu/tcl/doc/tclvars.n
+fsf/dejagnu/tcl/doc/tell.n
+fsf/dejagnu/tcl/doc/time.n
+fsf/dejagnu/tcl/doc/trace.n
+fsf/dejagnu/tcl/doc/unknown.n
+fsf/dejagnu/tcl/doc/unset.n
+fsf/dejagnu/tcl/doc/uplevel.n
+fsf/dejagnu/tcl/doc/upvar.n
+fsf/dejagnu/tcl/doc/usenix.ps
+fsf/dejagnu/tcl/doc/usenix.text
+fsf/dejagnu/tcl/doc/while.n
+fsf/dejagnu/tcl/install.sh
+fsf/dejagnu/tcl/library/init.tcl
+fsf/dejagnu/tcl/library/parray.tcl
+fsf/dejagnu/tcl/library/tclIndex
+fsf/dejagnu/tcl/panic.c
+fsf/dejagnu/tcl/patchlevel.h
+fsf/dejagnu/tcl/porting.notes
+fsf/dejagnu/tcl/regexp.c
+fsf/dejagnu/tcl/tcl.h
+fsf/dejagnu/tcl/tclAppInit.c
+fsf/dejagnu/tcl/tclAsync.c
+fsf/dejagnu/tcl/tclBasic.c
+fsf/dejagnu/tcl/tclCkalloc.c
+fsf/dejagnu/tcl/tclCmdAH.c
+fsf/dejagnu/tcl/tclCmdIL.c
+fsf/dejagnu/tcl/tclCmdMZ.c
+fsf/dejagnu/tcl/tclEnv.c
+fsf/dejagnu/tcl/tclExpr.c
+fsf/dejagnu/tcl/tclGet.c
+fsf/dejagnu/tcl/tclGlob.c
+fsf/dejagnu/tcl/tclHash.c
+fsf/dejagnu/tcl/tclHistory.c
+fsf/dejagnu/tcl/tclInt.h
+fsf/dejagnu/tcl/tclLink.c
+fsf/dejagnu/tcl/tclMain.c
+fsf/dejagnu/tcl/tclMtherr.c
+fsf/dejagnu/tcl/tclParse.c
+fsf/dejagnu/tcl/tclProc.c
+fsf/dejagnu/tcl/tclRegexp.h
+fsf/dejagnu/tcl/tclTest.c
+fsf/dejagnu/tcl/tclUnix.h
+fsf/dejagnu/tcl/tclUnixAZ.c
+fsf/dejagnu/tcl/tclUnixStr.c
+fsf/dejagnu/tcl/tclUnixUtil.c
+fsf/dejagnu/tcl/tclUtil.c
+fsf/dejagnu/tcl/tclVar.c
+fsf/dejagnu/tcl/tests/README
+fsf/dejagnu/tcl/tests/all
+fsf/dejagnu/tcl/tests/append.test
+fsf/dejagnu/tcl/tests/async.test
+fsf/dejagnu/tcl/tests/case.test
+fsf/dejagnu/tcl/tests/cd.test
+fsf/dejagnu/tcl/tests/cmdinfo.test
+fsf/dejagnu/tcl/tests/concat.test
+fsf/dejagnu/tcl/tests/dcall.test
+fsf/dejagnu/tcl/tests/defs
+fsf/dejagnu/tcl/tests/dstring.test
+fsf/dejagnu/tcl/tests/env.test
+fsf/dejagnu/tcl/tests/error.test
+fsf/dejagnu/tcl/tests/eval.test
+fsf/dejagnu/tcl/tests/exec.test
+fsf/dejagnu/tcl/tests/expr.test
+fsf/dejagnu/tcl/tests/file.test
+fsf/dejagnu/tcl/tests/for.test
+fsf/dejagnu/tcl/tests/format.test
+fsf/dejagnu/tcl/tests/glob.test
+fsf/dejagnu/tcl/tests/history.test
+fsf/dejagnu/tcl/tests/if.test
+fsf/dejagnu/tcl/tests/incr.test
+fsf/dejagnu/tcl/tests/info.test
+fsf/dejagnu/tcl/tests/join.test
+fsf/dejagnu/tcl/tests/lindex.test
+fsf/dejagnu/tcl/tests/link.test
+fsf/dejagnu/tcl/tests/linsert.test
+fsf/dejagnu/tcl/tests/list.test
+fsf/dejagnu/tcl/tests/llength.test
+fsf/dejagnu/tcl/tests/lrange.test
+fsf/dejagnu/tcl/tests/lreplace.test
+fsf/dejagnu/tcl/tests/lsearch.test
+fsf/dejagnu/tcl/tests/lsort.test
+fsf/dejagnu/tcl/tests/misc.test
+fsf/dejagnu/tcl/tests/open.test
+fsf/dejagnu/tcl/tests/parse.test
+fsf/dejagnu/tcl/tests/pid.test
+fsf/dejagnu/tcl/tests/proc.test
+fsf/dejagnu/tcl/tests/regexp.test
+fsf/dejagnu/tcl/tests/rename.test
+fsf/dejagnu/tcl/tests/scan.test
+fsf/dejagnu/tcl/tests/set.test
+fsf/dejagnu/tcl/tests/source.test
+fsf/dejagnu/tcl/tests/split.test
+fsf/dejagnu/tcl/tests/string.test
+fsf/dejagnu/tcl/tests/switch.test
+fsf/dejagnu/tcl/tests/trace.test
+fsf/dejagnu/tcl/tests/unknown.test
+fsf/dejagnu/tcl/tests/uplevel.test
+fsf/dejagnu/tcl/tests/upvar.test
+fsf/dejagnu/tcl/tests/while.test
+fsf/dejagnu/tcl/testsuite/ChangeLog
+fsf/dejagnu/tcl/testsuite/config/default.exp
+fsf/dejagnu/tcl/testsuite/tcl.tests/tcl-test.exp
diff -rup --new-file baseline/fsf/dejagnu/tcl/Makefile.in amiga/fsf/dejagnu/tcl/Makefile.in
--- baseline/fsf/dejagnu/tcl/Makefile.in Tue Apr 5 18:00:41 1994
+++ amiga/fsf/dejagnu/tcl/Makefile.in Sat Sep 28 00:00:00 1996
@@ -21,7 +21,7 @@
#
# both these values get replaced by running configure
#
-prefix = /usr/local
+prefix = /ade
exec_prefix = $(prefix)
# Directory in which to install the library of Tcl scripts (note:
@@ -54,7 +54,7 @@ MANN_DIR = $(MAN_DIR)/mann
# To change the compiler switches, for example to change from -O
# to -g, change the following line:
-CFLAGS = -g
+CFLAGS = -O
# To disable ANSI-C procedure prototypes reverse the comment characters
# on the following lines:
diff -rup --new-file baseline/fsf/dejagnu/tcl/configure amiga/fsf/dejagnu/tcl/configure
--- baseline/fsf/dejagnu/tcl/configure Tue Apr 12 16:45:29 1994
+++ amiga/fsf/dejagnu/tcl/configure Mon Sep 30 22:39:12 1996
@@ -1,53 +1,57 @@
-#!/bin/sh
+#! /bin/sh
+
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 1.7.9
-# Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.10
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
-# This configure script is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This script is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# Save the original args to write them into config.status later.
-ac_configure_args="$*"
-
-# Only options that might do something get documented.
-ac_usage="Usage: configure [options] [host]
-Options: [defaults in brackets]
---enable-FEATURE[=VAL] include FEATURE [VAL=yes]
---exec-prefix=PREFIX install host dependent files in PREFIX [/usr/local]
---help print this message
---prefix=PREFIX install host independent files in PREFIX [/usr/local]
---quiet, --silent do not print \`checking for...' messages
---srcdir=DIR find the sources in DIR [configure dir or ..]
---verbose print results of checks
---version print the version of autoconf that created configure
---with-PACKAGE use external PACKAGE
---without-PACKAGE do not use external PACKAGE"
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
build=NONE
-exec_prefix=
+cache_file=./config.cache
+exec_prefix=NONE
host=NONE
-norecursion=
-prefix=
-program_prefix=
-program_suffix=
-program_transform_name=
-ac_silent=
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
site=
srcdir=
target=NONE
-ac_verbose=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
ac_prev=
for ac_option
@@ -60,26 +64,52 @@ do
continue
fi
- # Accept but ignore most of the Cygnus configure options,
- # so we can diagnose typos and other invalid options.
-
case "$ac_option" in
- *=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ -*=*) 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
- -build | --build | --buil | --bui | --bu | --b)
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir="$ac_optarg" ;;
+
+ -build | --build | --buil | --bui | --bu)
ac_prev=build ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
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" ;;
+
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir="$ac_optarg" ;;
+
+ -disable-* | --disable-*)
+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+ # Reject names that are not valid shell variable names.
+ 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=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
- # Reject names that aren't valid shell variable names.
+ # Reject names that are not valid shell variable names.
if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
- echo "configure: $ac_feature: invalid feature name" >&2; exit 1
+ { 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
@@ -88,7 +118,6 @@ do
esac
eval "enable_${ac_feature}='$ac_optarg'" ;;
- # For backward compatibility, recognize -exec-prefix and --exec_prefix.
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
| --exec | --exe | --ex)
@@ -98,12 +127,66 @@ do
| --exec=* | --exe=* | --ex=*)
exec_prefix="$ac_optarg" ;;
- -gas | --gas | --ga | --g) with_gas=1 ;; # Obsolete; use --with-gas.
+ -gas | --gas | --ga | --g)
+ # Obsolete; use --with-gas.
+ with_gas=yes ;;
-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
-$ac_usage
+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]
+ --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide]
+ --psdir=DIR postscript documentation in DIR [PREFIX/ps]
+ --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi]
+ --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)
@@ -111,11 +194,76 @@ EOF
-host=* | --host=* | --hos=* | --ho=*)
host="$ac_optarg" ;;
- -nfp | --nfp | --nf) with_fp=no ;; # Obsolete; use --without-fp.
-
- -norecursion | --norecursion | --norecursio | --norecursi \
- | --norecurs | --norecur | --norecu | --norec | --nore | --nor | --no)
- norecursion=yes ;;
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir="$ac_optarg" ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir="$ac_optarg" ;;
+
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+ ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ 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" ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir="$ac_optarg" ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir="$ac_optarg" ;;
+
+ -nfp | --nfp | --nf)
+ # Obsolete; use --without-fp.
+ with_fp=no ;;
+
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c)
+ no_create=yes ;;
+
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+ no_recursion=yes ;;
+
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir="$ac_optarg" ;;
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
@@ -155,11 +303,28 @@ EOF
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
- ac_silent=yes ;;
+ silent=yes ;;
+
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir="$ac_optarg" ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir="$ac_optarg" ;;
-site | --site | --sit)
ac_prev=site ;;
- -site= | --site=* | --sit=*)
+ -site=* | --site=* | --sit=*)
site="$ac_optarg" ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
@@ -167,23 +332,30 @@ EOF
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
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" ;;
+
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
target="$ac_optarg" ;;
-v | -verbose | --verbose | --verbos | --verbo | --verb)
- ac_verbose=yes ;;
+ verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 1.7.9"
+ echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
- # Reject names that aren't valid shell variable names.
+ # Reject names that are not valid shell variable names.
if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
- echo "configure: $ac_package: invalid package name" >&2; exit 1
+ { 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
@@ -194,42 +366,95 @@ EOF
-without-* | --without-*)
ac_package=`echo $ac_option|sed -e 's/-*without-//'`
- # Reject names that aren't valid shell variable names.
+ # Reject names that are not valid shell variable names.
if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
- echo "configure: $ac_package: invalid package name" >&2; exit 1
+ { 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) with_x=1 ;; # Obsolete; use --with-x.
+ --x)
+ # Obsolete; use --with-x.
+ with_x=yes ;;
+
+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+ | --x-incl | --x-inc | --x-in | --x-i)
+ 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-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" ;;
- -*) echo "configure: warning: $ac_option: invalid option; use --help to show usage" >&2
+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
- *)
- if test -n "`echo $ac_option| sed 's/[-a-z0-9]//g'`"; then
- echo "configure: warning: $ac_option: invalid host type" >&2
+ *)
+ 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
- echo "configure: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" >&2; exit 1
+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
fi
-trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
-trap 'rm -fr confdefs* $ac_clean_files' 0
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-# Save the original args if we used an alternate arg parser.
-ac_configure_args="${ac_configure_args-$*}"
+# 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
+
+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
+ 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
# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = 'set'; then LC_ALL=C; export LC_ALL; fi
-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 "${LANG+set}" = set; then LANG=C; export LANG; fi
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
@@ -243,7 +468,7 @@ ac_unique_file=tcl.h
# 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 `..'.
+ # Try the directory containing this script, then its parent.
ac_prog=$0
ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
@@ -251,102 +476,312 @@ if test -z "$srcdir"; then
if test ! -r $srcdir/$ac_unique_file; then
srcdir=..
fi
+else
+ ac_srcdir_defaulted=no
fi
if test ! -r $srcdir/$ac_unique_file; then
- if test x$ac_srcdir_defaulted = xyes; then
- echo "configure: can not find sources in ${ac_confdir} or .." >&2; exit 1
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+ else
+ { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+ fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
else
- echo "configure: can not find sources in ${srcdir}" >&2; exit 1
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi
fi
+for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+ echo "loading site script $ac_site_file"
+ . "$ac_site_file"
+ fi
+done
+
+if test -r "$cache_file"; then
+ echo "loading cache $cache_file"
+ . $cache_file
+else
+ echo "creating cache $cache_file"
+ > $cache_file
+fi
ac_ext=c
-ac_cpp='${CPP} $CFLAGS'
-ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
+# 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+
+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_n= ac_c='\c' ac_t=
+fi
+
+
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_RANLIB="ranlib"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+ echo "$ac_t""$RANLIB" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
-if test -z "$RANLIB"; then
- # Extract the first word of `ranlib', so it can be a program name with args.
- set ac_dummy ranlib; ac_word=$2
- test -n "$ac_silent" || echo "checking for $ac_word"
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+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="${IFS}:"
+ for ac_dir in $PATH; 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"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+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="${IFS}:"
+ ac_prog_rejected=no
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- RANLIB="ranlib"
+ 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 $# -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" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+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:648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+else
+ ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+ if test "${CFLAGS+set}" != set; then
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ ac_cv_prog_gcc_g=yes
+else
+ ac_cv_prog_gcc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+ if test $ac_cv_prog_gcc_g = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-O2"
+ fi
+ fi
+else
+ GCC=
+ test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
-test -z "$RANLIB" && RANLIB=":"
-test -n "$RANLIB" && test -n "$ac_verbose" && echo " setting RANLIB to $RANLIB"
-test -n "$ac_silent" || echo "checking how to run the C preprocessor"
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
if test -z "$CPP"; then
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and ``${CC-cc}'' will simply confuse
- # make. It must be expanded now.
+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"
- cat > conftest.${ac_ext} <<EOF
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+#line 700 "configure"
#include "confdefs.h"
-#include <stdio.h>
+#include <assert.h>
Syntax Error
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
+ echo "$ac_err" >&5
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.${ac_ext} <<EOF
+ cat > conftest.$ac_ext <<EOF
+#line 715 "configure"
#include "confdefs.h"
-#include <stdio.h>
+#include <assert.h>
Syntax Error
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
+ echo "$ac_err" >&5
rm -rf conftest*
CPP=/lib/cpp
fi
rm -f conftest*
fi
rm -f conftest*
+ ac_cv_prog_CPP="$CPP"
+fi
+ CPP="$ac_cv_prog_CPP"
+else
+ ac_cv_prog_CPP="$CPP"
fi
-test -n "$ac_verbose" && echo " setting CPP to $CPP"
+echo "$ac_t""$CPP" 1>&6
-CC=${CC-cc}
#--------------------------------------------------------------------
# On a few rare braindead systems, libm.a is the same as libc.a
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for sin"
-cat > conftest.${ac_ext} <<EOF
+echo $ac_n "checking for -lm""... $ac_c" 1>&6
+ac_lib_var=`echo m'_'main | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 755 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
-/* 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_sin) || defined (__stub___sin)
-choke me
-#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char sin(); sin();
-#endif
+
+int main() { t(); return 0; }
+int t() {
+main()
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- LIBS="-lm" ; test -n "$verbose" && echo " Adding -lm to library list"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo m | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lm $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
#--------------------------------------------------------------------
@@ -356,157 +791,256 @@ rm -f conftest*
for ac_func in getcwd opendir strerror strstr
do
-test -n "$ac_silent" || echo "checking for ${ac_func}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+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 800 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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})
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char ${ac_func}(); ${ac_func}();
+$ac_func();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
else
rm -rf conftest*
- LIBOBJS="$LIBOBJS ${ac_func}.o"
-test -n "$ac_verbose" && echo " using ${ac_func}.o instead"
+ 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
+ :
+else
+ echo "$ac_t""no" 1>&6
+LIBOBJS="$LIBOBJS ${ac_func}.o"
+fi
+
done
for ac_func in strtol tmpnam waitpid
do
-test -n "$ac_silent" || echo "checking for ${ac_func}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+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 851 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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})
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char ${ac_func}(); ${ac_func}();
+$ac_func();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
else
rm -rf conftest*
- LIBOBJS="$LIBOBJS ${ac_func}.o"
-test -n "$ac_verbose" && echo " using ${ac_func}.o instead"
+ 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
+ :
+else
+ echo "$ac_t""no" 1>&6
+LIBOBJS="$LIBOBJS ${ac_func}.o"
+fi
+
done
-test -n "$ac_silent" || echo "checking for gettimeofday"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 900 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gettimeofday(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gettimeofday();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_gettimeofday) || defined (__stub___gettimeofday)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char gettimeofday(); gettimeofday();
+gettimeofday();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_gettimeofday=yes"
else
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining NO_GETTOD"
-echo "#define" NO_GETTOD "1" >> confdefs.h
-DEFS="$DEFS -DNO_GETTOD=1"
-}
-
+ eval "ac_cv_func_gettimeofday=no"
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for getwd"
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_GETTOD 1
+EOF
+
+fi
+
+echo $ac_n "checking for getwd""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_getwd'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 950 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getwd(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getwd();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_getwd) || defined (__stub___getwd)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char getwd(); getwd();
+getwd();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_getwd=yes"
else
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining NO_GETWD"
-echo "#define" NO_GETWD "1" >> confdefs.h
-DEFS="$DEFS -DNO_GETWD=1"
-}
-
+ eval "ac_cv_func_getwd=no"
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for wait3"
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'getwd`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_GETWD 1
+EOF
+
+fi
+
+echo $ac_n "checking for wait3""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1000 "configure"
#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char wait3(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char wait3();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_wait3) || defined (__stub___wait3)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char wait3(); wait3();
+wait3();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:1024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_wait3=yes"
else
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining NO_WAIT3"
-echo "#define" NO_WAIT3 "1" >> confdefs.h
-DEFS="$DEFS -DNO_WAIT3=1"
-}
-
+ eval "ac_cv_func_wait3=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'wait3`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_WAIT3 1
+EOF
+
+fi
+
#--------------------------------------------------------------------
# Supply substitutes for missing POSIX header files. Special
@@ -517,13 +1051,15 @@ rm -f conftest*
# - some versions of string.h don't declare procedures such
# as strstr
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for dirent.h"
-cat > conftest.${ac_ext} <<EOF
+echo "checking for dirent.h" 1>&6
+cat > conftest.$ac_ext <<EOF
+#line 1057 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <dirent.h>
-int main() { return 0; }
-int t() {
+int main() { t(); return 0; }
+int t() {
+
#ifndef _POSIX_SOURCE
#ifdef __Lynx__
#error "Lynx headers are usually only valid if really in the POSIX environment"
@@ -536,12 +1072,12 @@ d = opendir("foobar");
entryPtr = readdir(d);
p = entryPtr->d_name;
closedir(d);
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
tcl_ok=1
-
else
rm -rf conftest*
tcl_ok=0
@@ -549,109 +1085,179 @@ fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for unistd.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "unistd.h" | tr './\055' '___'`
+echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
+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 1095 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining HAVE_UNISTD_H"
-echo "#define" HAVE_UNISTD_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_UNISTD_H=1"
-}
-
-
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_UNISTD_H 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
-test -n "$ac_silent" || echo "checking for errno.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "errno.h" | tr './\055' '___'`
+echo $ac_n "checking for errno.h""... $ac_c" 1>&6
+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 1128 "configure"
#include "confdefs.h"
#include <errno.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
- :
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_ERRNO_H"
-echo "#define" NO_ERRNO_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_ERRNO_H=1"
-}
-
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_ERRNO_H 1
+EOF
+
+fi
-test -n "$ac_silent" || echo "checking for float.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "float.h" | tr './\055' '___'`
+echo $ac_n "checking for float.h""... $ac_c" 1>&6
+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 1162 "configure"
#include "confdefs.h"
#include <float.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
- :
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_FLOAT_H"
-echo "#define" NO_FLOAT_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_FLOAT_H=1"
-}
-
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_FLOAT_H 1
+EOF
+
+fi
-test -n "$ac_silent" || echo "checking for limits.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "limits.h" | tr './\055' '___'`
+echo $ac_n "checking for limits.h""... $ac_c" 1>&6
+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 1196 "configure"
#include "confdefs.h"
#include <limits.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
- :
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_LIMITS_H"
-echo "#define" NO_LIMITS_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_LIMITS_H=1"
-}
-
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_LIMITS_H 1
+EOF
+
+fi
-test -n "$ac_silent" || echo "checking for stdlib.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "stdlib.h" | tr './\055' '___'`
+echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6
+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 1230 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
- tcl_ok=1
-
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
- tcl_ok=0
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ tcl_ok=1
+else
+ echo "$ac_t""no" 1>&6
+tcl_ok=0
+fi
-echo '#include "confdefs.h"
-#include <stdlib.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "strtol" conftest.out >/dev/null 2>&1; then
+cat > conftest.$ac_ext <<EOF
+#line 1256 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "strtol" >/dev/null 2>&1; then
:
else
rm -rf conftest*
@@ -659,21 +1265,27 @@ else
fi
rm -f conftest*
-echo '#include "confdefs.h"
-#include <stdlib.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "strtoul" conftest.out >/dev/null 2>&1; then
- :
+cat > conftest.$ac_ext <<EOF
+#line 1270 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "strtoul" >/dev/null 2>&1; then
+ :
else
rm -rf conftest*
tcl_ok=0
fi
rm -f conftest*
-echo '#include "confdefs.h"
-#include <stdlib.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "strtod" conftest.out >/dev/null 2>&1; then
+cat > conftest.$ac_ext <<EOF
+#line 1284 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "strtod" >/dev/null 2>&1; then
:
else
rm -rf conftest*
@@ -682,35 +1294,49 @@ fi
rm -f conftest*
if test $tcl_ok = 0; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_STDLIB_H"
-echo "#define" NO_STDLIB_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_STDLIB_H=1"
-}
+ cat >> confdefs.h <<\EOF
+#define NO_STDLIB_H 1
+EOF
fi
-test -n "$ac_silent" || echo "checking for string.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "string.h" | tr './\055' '___'`
+echo $ac_n "checking for string.h""... $ac_c" 1>&6
+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 1309 "configure"
#include "confdefs.h"
#include <string.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
- tcl_ok=1
-
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
- tcl_ok=0
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ tcl_ok=1
+else
+ echo "$ac_t""no" 1>&6
+tcl_ok=0
+fi
-echo '#include "confdefs.h"
-#include <string.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "strstr" conftest.out >/dev/null 2>&1; then
+cat > conftest.$ac_ext <<EOF
+#line 1335 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "strstr" >/dev/null 2>&1; then
:
else
rm -rf conftest*
@@ -718,10 +1344,13 @@ else
fi
rm -f conftest*
-echo '#include "confdefs.h"
-#include <string.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "strerror" conftest.out >/dev/null 2>&1; then
+cat > conftest.$ac_ext <<EOF
+#line 1349 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "strerror" >/dev/null 2>&1; then
:
else
rm -rf conftest*
@@ -730,56 +1359,78 @@ fi
rm -f conftest*
if test $tcl_ok = 0; then
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_STRING_H"
-echo "#define" NO_STRING_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_STRING_H=1"
-}
+ cat >> confdefs.h <<\EOF
+#define NO_STRING_H 1
+EOF
fi
-test -n "$ac_silent" || echo "checking for sys/time.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "sys/time.h" | tr './\055' '___'`
+echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6
+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 1374 "configure"
#include "confdefs.h"
#include <sys/time.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
- :
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_SYS_TIME_H"
-echo "#define" NO_SYS_TIME_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_SYS_TIME_H=1"
-}
-
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_SYS_TIME_H 1
+EOF
+
+fi
-test -n "$ac_silent" || echo "checking for sys/wait.h"
-cat > conftest.${ac_ext} <<EOF
+ac_safe=`echo "sys/wait.h" | tr './\055' '___'`
+echo $ac_n "checking for sys/wait.h""... $ac_c" 1>&6
+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 1408 "configure"
#include "confdefs.h"
#include <sys/wait.h>
EOF
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
- :
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_SYS_WAIT_H"
-echo "#define" NO_SYS_WAIT_H "1" >> confdefs.h
-DEFS="$DEFS -DNO_SYS_WAIT_H=1"
-}
-
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define NO_SYS_WAIT_H 1
+EOF
+
+fi
#--------------------------------------------------------------------
@@ -788,7 +1439,37 @@ rm -f conftest*
#--------------------------------------------------------------------
echo "checking for strstr.o"
-cat > conftest.${ac_ext} <<EOF
+# If we cannot run a trivial program, we must be cross compiling.
+echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_c_cross=yes
+else
+cat > conftest.$ac_ext <<EOF
+#line 1452 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+{ (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_cross=no
+else
+ ac_cv_c_cross=yes
+fi
+fi
+rm -fr conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_cross" 1>&6
+cross_compiling=$ac_cv_c_cross
+
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 1473 "configure"
#include "confdefs.h"
extern int strstr();
@@ -798,12 +1479,13 @@ int main()
}
EOF
-eval $ac_compile
+{ (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
LIBOBJS="$LIBOBJS strstr.o"
fi
+fi
rm -fr conftest*
#--------------------------------------------------------------------
@@ -812,34 +1494,58 @@ rm -fr conftest*
# pointer for the string "0".
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for strtoul"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for strtoul""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1503 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char strtoul(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strtoul();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_strtoul) || defined (__stub___strtoul)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char strtoul(); strtoul();
+strtoul();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- tcl_ok=1
-
+ eval "ac_cv_func_strtoul=yes"
else
rm -rf conftest*
- tcl_ok=0
+ eval "ac_cv_func_strtoul=no"
fi
rm -f conftest*
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'strtoul`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ tcl_ok=1
+else
+ echo "$ac_t""no" 1>&6
+tcl_ok=0
+fi
+
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 1549 "configure"
#include "confdefs.h"
extern int strtoul();
@@ -855,12 +1561,13 @@ int main()
exit(0);
}
EOF
-eval $ac_compile
+{ (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
tcl_ok=0
fi
+fi
rm -fr conftest*
if test $tcl_ok = 0; then
test -n "$verbose" && echo " Adding strtoul.o."
@@ -872,34 +1579,58 @@ fi
# some versions of Linux it mis-parses the string "+".
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for strtod"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for strtod""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1588 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char strtod(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strtod();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_strtod) || defined (__stub___strtod)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char strtod(); strtod();
+strtod();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- tcl_ok=1
-
+ eval "ac_cv_func_strtod=yes"
else
rm -rf conftest*
- tcl_ok=0
+ eval "ac_cv_func_strtod=no"
fi
rm -f conftest*
-cat > conftest.${ac_ext} <<EOF
+fi
+if eval "test \"`echo '$ac_cv_func_'strtod`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ tcl_ok=1
+else
+ echo "$ac_t""no" 1>&6
+tcl_ok=0
+fi
+
+if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+cat > conftest.$ac_ext <<EOF
+#line 1634 "configure"
#include "confdefs.h"
extern double strtod();
@@ -915,12 +1646,13 @@ int main()
exit(0);
}
EOF
-eval $ac_compile
+{ (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
tcl_ok=0
fi
+fi
rm -fr conftest*
if test $tcl_ok = 0; then
test -n "$verbose" && echo " Adding strtod.o."
@@ -932,89 +1664,229 @@ fi
# they don't exist.
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for mode_t in sys/types.h"
-echo '#include "confdefs.h"
-#include <sys/types.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "mode_t" conftest.out >/dev/null 2>&1; then
- :
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
+ cat > conftest.$ac_ext <<EOF
+#line 1673 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining" mode_t to be "int"
-echo "#define" mode_t "int" >> confdefs.h
-DEFS="$DEFS -Dmode_t=int"
-}
-
+ ac_cv_header_stdc=yes
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ ac_cv_header_stdc=no
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for pid_t in sys/types.h"
-echo '#include "confdefs.h"
-#include <sys/types.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "pid_t" conftest.out >/dev/null 2>&1; then
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 1696 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "memchr" >/dev/null 2>&1; then
:
else
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining" pid_t to be "int"
-echo "#define" pid_t "int" >> confdefs.h
-DEFS="$DEFS -Dpid_t=int"
-}
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 1714 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "free" >/dev/null 2>&1; then
+ :
+else
+ rm -rf conftest*
+ ac_cv_header_stdc=no
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for size_t in sys/types.h"
-echo '#include "confdefs.h"
-#include <sys/types.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "size_t" conftest.out >/dev/null 2>&1; then
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+ :
+else
+cat > conftest.$ac_ext <<EOF
+#line 1735 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+{ (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
+ ac_cv_header_stdc=no
+fi
+fi
+rm -fr conftest*
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+ cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+
+echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1770 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "mode_t" >/dev/null 2>&1; then
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining" size_t to be "unsigned"
-echo "#define" size_t "unsigned" >> confdefs.h
-DEFS="$DEFS -Dsize_t=unsigned"
-}
+ ac_cv_type_mode_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_mode_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_mode_t" 1>&6
+if test $ac_cv_type_mode_t = no; then
+ cat >> confdefs.h <<\EOF
+#define mode_t int
+EOF
+
+fi
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1801 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "pid_t" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_pid_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_pid_t=no
fi
rm -f conftest*
-test -n "$ac_silent" || echo "checking for uid_t in sys/types.h"
-echo '#include "confdefs.h"
-#include <sys/types.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "uid_t" conftest.out >/dev/null 2>&1; then
- :
+fi
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+ cat >> confdefs.h <<\EOF
+#define pid_t int
+EOF
+
+fi
+
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1832 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "size_t" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_size_t=yes
else
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining" uid_t to be "int"
-echo "#define" uid_t "int" >> confdefs.h
-DEFS="$DEFS -Duid_t=int"
-}
-
-{
-test -n "$ac_verbose" && \
-echo " defining" gid_t to be "int"
-echo "#define" gid_t "int" >> confdefs.h
-DEFS="$DEFS -Dgid_t=int"
-}
+ ac_cv_type_size_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+ cat >> confdefs.h <<\EOF
+#define size_t unsigned
+EOF
fi
+
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1863 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "uid_t" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_uid_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_uid_t=no
+fi
rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+ cat >> confdefs.h <<\EOF
+#define uid_t int
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define gid_t int
+EOF
+
+fi
+
#--------------------------------------------------------------------
# If a system doesn't have an opendir function (man, that's old!)
@@ -1023,37 +1895,56 @@ rm -f conftest*
# provided. This version only works with V7-style directories.
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for opendir"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() {
+echo $ac_n "checking for opendir""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1904 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char opendir(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
+
+int main() { t(); return 0; }
+int t() {
+
/* 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_opendir) || defined (__stub___opendir)
choke me
#else
-/* Override any gcc2 internal prototype to avoid an error. */
-extern char opendir(); opendir();
+opendir();
#endif
+
; return 0; }
EOF
-if eval $ac_compile; then
- :
+if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_opendir=yes"
else
rm -rf conftest*
- {
-test -n "$ac_verbose" && \
-echo " defining USE_DIRENT2_H"
-echo "#define" USE_DIRENT2_H "1" >> confdefs.h
-DEFS="$DEFS -DUSE_DIRENT2_H=1"
-}
-
+ eval "ac_cv_func_opendir=no"
fi
rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'opendir`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define USE_DIRENT2_H 1
+EOF
+
+fi
+
#--------------------------------------------------------------------
# Check for the existence of sys_errlist (this is only needed if
@@ -1061,28 +1952,27 @@ rm -f conftest*
# check).
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for sys_errlist"
-cat > conftest.${ac_ext} <<EOF
+echo "checking for sys_errlist" 1>&6
+cat > conftest.$ac_ext <<EOF
+#line 1958 "configure"
#include "confdefs.h"
-int main() { return 0; }
-int t() {
+int main() { t(); return 0; }
+int t() {
+
extern char *sys_errlist[];
extern int sys_nerr;
sys_errlist[sys_nerr-1][0] = 0;
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
:
else
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_SYS_ERRLIST"
-echo "#define" NO_SYS_ERRLIST "1" >> confdefs.h
-DEFS="$DEFS -DNO_SYS_ERRLIST=1"
-}
+ cat >> confdefs.h <<\EOF
+#define NO_SYS_ERRLIST 1
+EOF
fi
rm -f conftest*
@@ -1096,29 +1986,28 @@ rm -f conftest*
# the trick.
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for union wait"
-cat > conftest.${ac_ext} <<EOF
+echo "checking for union wait" 1>&6
+cat > conftest.$ac_ext <<EOF
+#line 1992 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
-int main() { return 0; }
-int t() {
+int main() { t(); return 0; }
+int t() {
+
union wait x;
WIFEXITED(x); /* Generates compiler error if WIFEXITED
* uses an int. */
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
:
else
rm -rf conftest*
-
-{
-test -n "$ac_verbose" && \
-echo " defining NO_UNION_WAIT"
-echo "#define" NO_UNION_WAIT "1" >> confdefs.h
-DEFS="$DEFS -DNO_UNION_WAIT=1"
-}
+ cat >> confdefs.h <<\EOF
+#define NO_UNION_WAIT 1
+EOF
fi
rm -f conftest*
@@ -1129,41 +2018,70 @@ rm -f conftest*
# and its associated type "struct exception".
#--------------------------------------------------------------------
-test -n "$ac_silent" || echo "checking for matherr support"
-cat > conftest.${ac_ext} <<EOF
+echo "checking for matherr support" 1>&6
+cat > conftest.$ac_ext <<EOF
+#line 2024 "configure"
#include "confdefs.h"
#include <math.h>
-int main() { return 0; }
-int t() {
+int main() { t(); return 0; }
+int t() {
+
struct exception x;
x.type = DOMAIN;
x.type = SING;
+
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- LIBOBJS="$LIBOBJS tclMtherr.o";
-{
-test -n "$ac_verbose" && \
-echo " defining NEED_MATHERR"
-echo "#define" NEED_MATHERR "1" >> confdefs.h
-DEFS="$DEFS -DNEED_MATHERR=1"
-}
-
+ LIBOBJS="$LIBOBJS tclMtherr.o"; cat >> confdefs.h <<\EOF
+#define NEED_MATHERR 1
+EOF
fi
rm -f conftest*
-# Set default prefixes.
-if test -n "$prefix"; then
- test -z "$exec_prefix" && exec_prefix='${prefix}' # Let make expand it.
- ac_prsub="s%^prefix\\([ ]*\\)=\\([ ]*\\).*$%prefix\\1=\\2$prefix%"
-fi
-if test -n "$exec_prefix"; then
- ac_prsub="$ac_prsub
-s%^exec_prefix\\([ ]*\\)=\\([ ]*\\).*$%exec_prefix\\1=\\2$exec_prefix%"
+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. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# 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.
+#
+EOF
+# 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 |
+ sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+ >> confcache
+if cmp -s $cache_file confcache; then
+ :
+else
+ if test -w $cache_file; then
+ 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}'
+
# 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.
@@ -1171,36 +2089,50 @@ if test "x$srcdir" = x.; then
ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
fi
-# Quote sed substitution magic chars in DEFS.
-cat >conftest.def <<EOF
-$DEFS
-EOF
-ac_escape_ampersand_and_backslash='s%[&\\]%\\&%g'
-DEFS=`sed "$ac_escape_ampersand_and_backslash" <conftest.def`
-rm -f conftest.def
-# Substitute for predefined variables.
-
-trap 'rm -f config.status; exit 1' 1 2 15
-echo creating config.status
-rm -f config.status
-cat > config.status <<EOF
-#!/bin/sh
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
+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.
-ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]"
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
for ac_option
do
case "\$ac_option" in
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args ;;
+ 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 1.7.9"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -1208,71 +2140,107 @@ do
esac
done
-trap 'rm -f Makefile; exit 1' 1 2 15
-RANLIB='$RANLIB'
-CPP='$CPP'
-CC='$CC'
-LIBOBJS='$LIBOBJS'
-LIBS='$LIBS'
-srcdir='$srcdir'
-prefix='$prefix'
-exec_prefix='$exec_prefix'
-DEFS='$DEFS'
-ac_prsub='$ac_prsub'
-ac_vpsub='$ac_vpsub'
-extrasub='$extrasub'
+ac_given_srcdir=$srcdir
+
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
-cat >> config.status <<\EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# 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%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%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%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
+s%@mandir@%$mandir%g
+s%@RANLIB@%$RANLIB%g
+s%@CC@%$CC%g
+s%@CPP@%$CPP%g
+s%@LIBOBJS@%$LIBOBJS%g
-ac_top_srcdir=$srcdir
+CEOF
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ # Support "outfile[:infile]", defaulting infile="outfile.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
+
+ # Adjust relative srcdir, etc. for subdirectories.
-CONFIG_FILES=${CONFIG_FILES-"Makefile"}
-for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then
# 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"; then
+ 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="/$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'`
else
- ac_dir_suffix=
+ ac_dir_suffix= ac_dots=
fi
- case "$ac_top_srcdir" in
- .) srcdir=. ;;
- /*) srcdir="$ac_top_srcdir$ac_dir_suffix" ;;
- *)
- # Relative path. Prepend a "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
- srcdir="$ac_dots$ac_top_srcdir$ac_dir_suffix" ;;
+ 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.
+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
echo creating "$ac_file"
rm -f "$ac_file"
- comment_str="Generated automatically from `echo $ac_file|sed 's|.*/||'`.in by configure."
+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
case "$ac_file" in
- *.c | *.h | *.C | *.cc | *.m ) echo "/* $comment_str */" > "$ac_file" ;;
- * ) echo "# $comment_str" > "$ac_file" ;;
+ *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+ *) ac_comsub= ;;
esac
- sed -e "
-$ac_prsub
-$ac_vpsub
-$extrasub
-s%@RANLIB@%$RANLIB%g
-s%@CPP@%$CPP%g
-s%@CC@%$CC%g
-s%@LIBOBJS@%$LIBOBJS%g
-s%@LIBS@%$LIBS%g
+ sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
-s%@prefix@%$prefix%g
-s%@exec_prefix@%$exec_prefix%g
-s%@DEFS@%$DEFS%
-" $ac_top_srcdir/${ac_file}.in >> $ac_file
+s%@top_srcdir@%$top_srcdir%g
+" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
fi; done
+rm -f conftest.subs
+
exit 0
EOF
-chmod +x config.status
-${CONFIG_SHELL-/bin/sh} config.status
+chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/dejagnu/tcl/configure.in amiga/fsf/dejagnu/tcl/configure.in
--- baseline/fsf/dejagnu/tcl/configure.in Thu Mar 31 14:41:09 1994
+++ amiga/fsf/dejagnu/tcl/configure.in Sat Sep 28 00:00:00 1996
@@ -3,15 +3,15 @@ dnl generate the file "configure", which
dnl to configure the system for the local environment.
AC_INIT(tcl.h)
AC_PROG_RANLIB
+AC_PROG_CC
AC_PROG_CPP
-CC=${CC-cc}
AC_SUBST(CC)
#--------------------------------------------------------------------
# On a few rare braindead systems, libm.a is the same as libc.a
#--------------------------------------------------------------------
-AC_FUNC_CHECK(sin, , LIBS="-lm" ; test -n "$verbose" && echo " Adding -lm to library list")
+AC_CHECK_LIB(m, main)
#--------------------------------------------------------------------
# Supply substitutes for missing POSIX library procedures, or
diff -rup --new-file baseline/fsf/dejagnu/tcl/regexp.c amiga/fsf/dejagnu/tcl/regexp.c
--- baseline/fsf/dejagnu/tcl/regexp.c Tue Jan 4 18:13:30 1994
+++ amiga/fsf/dejagnu/tcl/regexp.c Sat Sep 28 00:00:00 1996
@@ -131,7 +131,7 @@
/*
* Utility definitions.
*/
-#ifndef CHARBITS
+#if !defined(CHARBITS) || defined(__amigaos__)
#define UCHARAT(p) ((int)*(unsigned char *)(p))
#else
#define UCHARAT(p) ((int)*(p)&CHARBITS)
diff -rup --new-file baseline/fsf/dejagnu/tcl/tclUnixUtil.c amiga/fsf/dejagnu/tcl/tclUnixUtil.c
--- baseline/fsf/dejagnu/tcl/tclUnixUtil.c Tue Jan 4 19:13:24 1994
+++ amiga/fsf/dejagnu/tcl/tclUnixUtil.c Sat Sep 28 00:00:00 1996
@@ -576,8 +576,12 @@ Tcl_CreatePipeline(interp, argc, argv, p
if (errFilePtr != NULL) {
char errName[L_tmpnam];
+ static unsigned short cnt;
- tmpnam(errName);
+ if (cnt == 0)
+ cnt = (getpid() & 0xffff) | 1;
+
+ sprintf(errName, "/t/tmp.tcl.%05u", cnt++);
*errFilePtr = open(errName, O_RDONLY|O_CREAT|O_TRUNC, 0600);
if (*errFilePtr < 0) {
errFileError:
@@ -668,7 +672,7 @@ Tcl_CreatePipeline(interp, argc, argv, p
}
}
execName = Tcl_TildeSubst(interp, argv[firstArg], &buffer);
- pid = fork();
+ pid = vfork();
if (pid == 0) {
char errSpace[200];
@@ -678,7 +682,7 @@ Tcl_CreatePipeline(interp, argc, argv, p
|| (!joinThisError && (errorId != -1)
&& (dup2(errorId, 2) == -1))) {
char *err;
- err = "forked process couldn't set up input/output\n";
+ err = "vforked process couldn't set up input/output\n";
write(errorId < 0 ? 2 : errorId, err, (size_t) strlen(err));
_exit(1);
}
@@ -694,7 +698,7 @@ Tcl_CreatePipeline(interp, argc, argv, p
}
Tcl_DStringFree(&buffer);
if (pid == -1) {
- Tcl_AppendResult(interp, "couldn't fork child process: ",
+ Tcl_AppendResult(interp, "couldn't vfork child process: ",
Tcl_PosixError(interp), (char *) NULL);
goto error;
}
diff -rup --new-file baseline/fsf/dejagnu/tcl/tests/defs amiga/fsf/dejagnu/tcl/tests/defs
--- baseline/fsf/dejagnu/tcl/tests/defs Tue Jan 4 18:25:35 1994
+++ amiga/fsf/dejagnu/tcl/tests/defs Sat Sep 28 00:00:00 1996
@@ -81,7 +81,7 @@ proc test {test_name test_description co
$answer
puts stdout "---- Result should have been:"
puts stdout "$passing_results"
- puts stdout "---- $test_name FAILED"
+ puts stdout "++++ $test_name FAILED"
}
}
diff -rup --new-file baseline/fsf/dejagnu/tcl/tests/format.test amiga/fsf/dejagnu/tcl/tests/format.test
--- baseline/fsf/dejagnu/tcl/tests/format.test Tue Jan 4 19:16:52 1994
+++ amiga/fsf/dejagnu/tcl/tests/format.test Sat Sep 28 00:00:00 1996
@@ -219,13 +219,13 @@ test format-5.2 {floating-point zeroes}
} {0.0000e+00 0.0000 0}
test format-5.3 {floating-point zeroes} {
format "%#.4e %#.4f %#.4g" 0.0 0.0 0.0 0.0
-} {0.0000e+00 0.0000 0.000}
+} {0.0000e+00 0.0000 0.0000}
test format-5.4 {floating-point zeroes} {
format "%.0e %.0f %.0g" 0.0 0.0 0.0 0.0
} {0e+00 0 0}
test format-5.5 {floating-point zeroes} {
format "%#.0e %#.0f %#.0g" 0.0 0.0 0.0 0.0
-} {0.e+00 0. 0.}
+} {0.e+00 0. 0.0}
test format-5.6 {floating-point zeroes} {
format "%3.0f %3.0f %3.0f %3.0f" 0.0 0.0 0.0 0.0
} { 0 0 0 0}
diff -rup --new-file baseline/fsf/dejagnu/tcl/tests/open.test amiga/fsf/dejagnu/tcl/tests/open.test
--- baseline/fsf/dejagnu/tcl/tests/open.test Tue Jan 4 19:17:20 1994
+++ amiga/fsf/dejagnu/tcl/tests/open.test Sat Sep 28 00:00:00 1996
@@ -311,7 +311,7 @@ test open-8.8 {read command} {
close $f
set x
} {1 {expected integer but got "12z"} NONE}
-test open-898 {read command} {
+test open-8.9 {read command} {
set f [open test1]
set x [list [catch {read $f z} msg] $msg $errorCode]
close $f
diff -rup --new-file baseline/fsf/dejagnu/tcl/testsuite/tcl.tests/tcl-test.exp amiga/fsf/dejagnu/tcl/testsuite/tcl.tests/tcl-test.exp
--- baseline/fsf/dejagnu/tcl/testsuite/tcl.tests/tcl-test.exp Thu Mar 31 12:56:07 1994
+++ amiga/fsf/dejagnu/tcl/testsuite/tcl.tests/tcl-test.exp Sat Sep 28 00:00:00 1996
@@ -62,13 +62,13 @@ expect {
set timeoutmsg "Never got to the end of "
exp_continue
}
+ -re "\[\r\n\]*\\+* \[a-z\]*-\[.0-9\]* FAILED\[\r\n\]*" {
+ fail [lindex $expect_out(0,string) 1]
+ exp_continue
+ }
-re "\[\r\n\]*\\+\\+\\+\\+ \[a-z\]*-\[.0-9\]* PASSED\[\r\n\]*" {
pass [lindex $expect_out(0,string) 1]
set timetol 0
- exp_continue
- }
- -re "\[\r\n\]*\\+* \[a-z\]*-\[.0-9\]* FAILED\[\r\n\]*" {
- fail [lindex $expect_out(0,string) 1]
exp_continue
}
-re "\[x\]+ \[a-i\]+ \[A-K\]+ \[0-9\]+ " {