diff -pruN 2.0-4.1/config.guess 2.1-0ubuntu8/config.guess --- 2.0-4.1/config.guess 1970-01-01 00:00:00.000000000 +0000 +++ 2.1-0ubuntu8/config.guess 2005-02-19 23:58:52.000000000 +0000 @@ -0,0 +1,1418 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +timestamp='2004-06-11' + +# This file 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 of the License, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit 0 ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit 0 ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit 0;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit 0 ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit 0 ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit 0 ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit 0 ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 + echo mips-mips-riscos${UNAME_RELEASE} + exit 0 ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit 0 ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit 0 ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit 0 ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit 0 ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit 0 ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit 0 ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit 0 ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit 0 ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit 0 ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit 0 ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit 0 ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit 0 ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit 0 ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit 0 ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit 0 ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit 0 ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit 0 ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit 0 ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit 0 ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit 0 ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo unknown-hitachi-hiuxwe2 + exit 0 ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit 0 ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit 0 ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit 0 ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit 0 ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit 0 ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit 0 ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit 0 ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit 0 ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit 0 ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + # GNU/KFreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + exit 0 ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit 0 ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit 0 ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit 0 ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit 0 ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit 0 ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit 0 ;; + i*86:*:5:[78]*) + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit 0 ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit 0 ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit 0 ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit 0 ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit 0 ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit 0 ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit 0 ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4 && exit 0 ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit 0 ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit 0 ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit 0 ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit 0 ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit 0 ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit 0 ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Darwin:*:*) + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit 0 ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit 0 ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit 0 ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit 0 ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit 0 ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit 0 ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit 0 ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + c34*) + echo c34-convex-bsd + exit 0 ;; + c38*) + echo c38-convex-bsd + exit 0 ;; + c4*) + echo c4-convex-bsd + exit 0 ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -pruN 2.0-4.1/config.h.in 2.1-0ubuntu8/config.h.in --- 2.0-4.1/config.h.in 2004-03-31 07:33:18.000000000 +0000 +++ 2.1-0ubuntu8/config.h.in 2005-03-05 19:28:42.000000000 +0000 @@ -88,12 +88,18 @@ /* Define if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if you have the `iphlpapi' library (-liphlpapi). */ +#undef HAVE_LIBIPHLPAPI + /* Define if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL /* Define if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET +/* Define if you have the `ws2_32' library (-lws2_32). */ +#undef HAVE_LIBWS2_32 + /* Define if you have the `MD5Update' function. */ #undef HAVE_MD5UPDATE @@ -178,12 +184,18 @@ /* Version number of package */ #undef VERSION +/* Define for faster code generation. */ +#undef WIN32_LEAN_AND_MEAN + /* Define to `int' if does not define. */ #undef pid_t /* Define to `unsigned' if does not define. */ #undef size_t +/* Use MingW32's internal snprintf */ +#undef snprintf + /* Define to `unsigned short' if does not define. */ #undef u_int16_t diff -pruN 2.0-4.1/config.sub 2.1-0ubuntu8/config.sub --- 2.0-4.1/config.sub 1970-01-01 00:00:00.000000000 +0000 +++ 2.1-0ubuntu8/config.sub 2005-02-19 23:58:52.000000000 +0000 @@ -0,0 +1,1549 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +timestamp='2004-03-12' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file 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 of the License, 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., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | msp430 \ + | ns16k | ns32k \ + | openrisc | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ + | ymp-* \ + | z8k-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-ibm) + os=-aix + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -pruN 2.0-4.1/configure 2.1-0ubuntu8/configure --- 2.0-4.1/configure 2004-04-08 03:18:12.000000000 +0000 +++ 2.1-0ubuntu8/configure 2005-03-05 19:21:31.000000000 +0000 @@ -659,6 +659,10 @@ Program names: --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 + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST build programs to run on HOST [BUILD] EOF fi @@ -669,6 +673,7 @@ if test -n "$ac_init_help"; then Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-wpdpack=DIR use WinPcap developer's pack in DIR --with-libpcap=DIR use libpcap build directory --with-libdnet=DIR use libdnet in DIR --with-libevent=DIR use libevent build directory @@ -865,7 +870,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:868: loading site script $ac_site_file" >&5 + { echo "$as_me:873: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -876,7 +881,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:879: loading cache $cache_file" >&5 + { echo "$as_me:884: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -884,7 +889,7 @@ echo "$as_me: loading cache $cache_file" esac fi else - { echo "$as_me:887: creating cache $cache_file" >&5 + { echo "$as_me:892: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -900,21 +905,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:903: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:908: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:907: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:912: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:913: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:918: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:915: former value: $ac_old_val" >&5 + { echo "$as_me:920: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:917: current value: $ac_new_val" >&5 + { echo "$as_me:922: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -933,9 +938,9 @@ echo "$as_me: current value: $ac_new_v fi done if $ac_cache_corrupted; then - { echo "$as_me:936: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:941: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:938: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:943: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -955,10 +960,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:958: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:963: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:961: \$? = $ac_status" >&5 + echo "$as_me:966: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -985,7 +990,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:988: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:993: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1005,7 +1010,7 @@ ac_configure="$SHELL $ac_aux_dir/configu # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1008: checking for a BSD compatible install" >&5 +echo "$as_me:1013: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -1054,7 +1059,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1057: result: $INSTALL" >&5 +echo "$as_me:1062: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1065,7 +1070,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1068: checking whether build environment is sane" >&5 +echo "$as_me:1073: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1088,7 +1093,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1091: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:1096: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1101,14 +1106,14 @@ then # Ok. : else - { { echo "$as_me:1104: error: newly created file is older than distributed files! + { { echo "$as_me:1109: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest* -echo "$as_me:1111: result: yes" >&5 +echo "$as_me:1116: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1123,7 +1128,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -echo "$as_me:1126: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1131: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -1143,21 +1148,21 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1146: result: yes" >&5 + echo "$as_me:1151: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1150: result: no" >&5 + echo "$as_me:1155: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi PACKAGE=scanssh -VERSION=2.0 +VERSION=2.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1160: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:1165: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1171,78 +1176,78 @@ cat >>confdefs.h <&5 +echo "$as_me:1179: checking for working aclocal-${am__api_version}" >&5 echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ACLOCAL=aclocal-${am__api_version} - echo "$as_me:1181: result: found" >&5 + echo "$as_me:1186: result: found" >&5 echo "${ECHO_T}found" >&6 else ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" - echo "$as_me:1185: result: missing" >&5 + echo "$as_me:1190: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1189: checking for working autoconf" >&5 +echo "$as_me:1194: checking for working autoconf" >&5 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoconf --version) < /dev/null > /dev/null 2>&1; then AUTOCONF=autoconf - echo "$as_me:1196: result: found" >&5 + echo "$as_me:1201: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOCONF="$missing_dir/missing autoconf" - echo "$as_me:1200: result: missing" >&5 + echo "$as_me:1205: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1204: checking for working automake-${am__api_version}" >&5 +echo "$as_me:1209: checking for working automake-${am__api_version}" >&5 echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=automake-${am__api_version} - echo "$as_me:1211: result: found" >&5 + echo "$as_me:1216: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOMAKE="$missing_dir/missing automake-${am__api_version}" - echo "$as_me:1215: result: missing" >&5 + echo "$as_me:1220: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1219: checking for working autoheader" >&5 +echo "$as_me:1224: checking for working autoheader" >&5 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoheader --version) < /dev/null > /dev/null 2>&1; then AUTOHEADER=autoheader - echo "$as_me:1226: result: found" >&5 + echo "$as_me:1231: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOHEADER="$missing_dir/missing autoheader" - echo "$as_me:1230: result: missing" >&5 + echo "$as_me:1235: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1234: checking for working makeinfo" >&5 +echo "$as_me:1239: checking for working makeinfo" >&5 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (makeinfo --version) < /dev/null > /dev/null 2>&1; then MAKEINFO=makeinfo - echo "$as_me:1241: result: found" >&5 + echo "$as_me:1246: result: found" >&5 echo "${ECHO_T}found" >&6 else MAKEINFO="$missing_dir/missing makeinfo" - echo "$as_me:1245: result: missing" >&5 + echo "$as_me:1250: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi @@ -1250,6 +1255,58 @@ ac_config_headers="$ac_config_headers co ac_config_commands="$ac_config_commands default-1" +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:1260: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:1264: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:1273: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:1277: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1282: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +echo "$as_me:1289: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:1298: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1303: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + if test "$prefix" = "NONE"; then prefix="/usr/local" fi @@ -1262,7 +1319,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1265: checking for $ac_word" >&5 +echo "$as_me:1322: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1277,7 +1334,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1280: found $ac_dir/$ac_word" >&5 +echo "$as_me:1337: found $ac_dir/$ac_word" >&5 break done @@ -1285,10 +1342,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1288: result: $CC" >&5 + echo "$as_me:1345: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1291: result: no" >&5 + echo "$as_me:1348: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1297,7 +1354,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1300: checking for $ac_word" >&5 +echo "$as_me:1357: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1312,7 +1369,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1315: found $ac_dir/$ac_word" >&5 +echo "$as_me:1372: found $ac_dir/$ac_word" >&5 break done @@ -1320,10 +1377,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1323: result: $ac_ct_CC" >&5 + echo "$as_me:1380: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1326: result: no" >&5 + echo "$as_me:1383: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1336,7 +1393,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1339: checking for $ac_word" >&5 +echo "$as_me:1396: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1351,7 +1408,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1354: found $ac_dir/$ac_word" >&5 +echo "$as_me:1411: found $ac_dir/$ac_word" >&5 break done @@ -1359,10 +1416,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1362: result: $CC" >&5 + echo "$as_me:1419: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1365: result: no" >&5 + echo "$as_me:1422: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1371,7 +1428,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1374: checking for $ac_word" >&5 +echo "$as_me:1431: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1386,7 +1443,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1389: found $ac_dir/$ac_word" >&5 +echo "$as_me:1446: found $ac_dir/$ac_word" >&5 break done @@ -1394,10 +1451,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1397: result: $ac_ct_CC" >&5 + echo "$as_me:1454: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1400: result: no" >&5 + echo "$as_me:1457: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1410,7 +1467,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1413: checking for $ac_word" >&5 +echo "$as_me:1470: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1430,7 +1487,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/c continue fi ac_cv_prog_CC="cc" -echo "$as_me:1433: found $ac_dir/$ac_word" >&5 +echo "$as_me:1490: found $ac_dir/$ac_word" >&5 break done @@ -1452,10 +1509,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1455: result: $CC" >&5 + echo "$as_me:1512: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1458: result: no" >&5 + echo "$as_me:1515: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1466,7 +1523,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1469: checking for $ac_word" >&5 +echo "$as_me:1526: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1481,7 +1538,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1484: found $ac_dir/$ac_word" >&5 +echo "$as_me:1541: found $ac_dir/$ac_word" >&5 break done @@ -1489,10 +1546,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1492: result: $CC" >&5 + echo "$as_me:1549: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1495: result: no" >&5 + echo "$as_me:1552: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1505,7 +1562,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1508: checking for $ac_word" >&5 +echo "$as_me:1565: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1520,7 +1577,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1523: found $ac_dir/$ac_word" >&5 +echo "$as_me:1580: found $ac_dir/$ac_word" >&5 break done @@ -1528,10 +1585,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1531: result: $ac_ct_CC" >&5 + echo "$as_me:1588: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1534: result: no" >&5 + echo "$as_me:1591: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1543,32 +1600,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1546: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1603: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1551:" \ +echo "$as_me:1608:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1554: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1611: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1557: \$? = $ac_status" >&5 + echo "$as_me:1614: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1559: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1616: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1562: \$? = $ac_status" >&5 + echo "$as_me:1619: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1564: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1621: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1567: \$? = $ac_status" >&5 + echo "$as_me:1624: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1571 "configure" +#line 1628 "configure" #include "confdefs.h" int @@ -1584,13 +1641,13 @@ ac_clean_files="$ac_clean_files a.out a. # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1587: checking for C compiler default output" >&5 +echo "$as_me:1644: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1590: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1647: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1593: \$? = $ac_status" >&5 + echo "$as_me:1650: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1613,34 +1670,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1616: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1673: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1622: result: $ac_file" >&5 +echo "$as_me:1679: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1627: checking whether the C compiler works" >&5 +echo "$as_me:1684: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1633: \"$ac_try\"") >&5 + { (eval echo "$as_me:1690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1636: \$? = $ac_status" >&5 + echo "$as_me:1693: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1643: error: cannot run C compiled programs. + { { echo "$as_me:1700: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1648,24 +1705,24 @@ If you meant to cross compile, use \`--h fi fi fi -echo "$as_me:1651: result: yes" >&5 +echo "$as_me:1708: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1658: checking whether we are cross compiling" >&5 +echo "$as_me:1715: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1660: result: $cross_compiling" >&5 +echo "$as_me:1717: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1663: checking for executable suffix" >&5 +echo "$as_me:1720: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1665: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1722: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1668: \$? = $ac_status" >&5 + echo "$as_me:1725: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1681,25 +1738,25 @@ for ac_file in `(ls conftest.exe; ls con esac done else - { { echo "$as_me:1684: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1741: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1690: result: $ac_cv_exeext" >&5 +echo "$as_me:1747: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1696: checking for object suffix" >&5 +echo "$as_me:1753: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1702 "configure" +#line 1759 "configure" #include "confdefs.h" int @@ -1711,10 +1768,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1714: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1771: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1717: \$? = $ac_status" >&5 + echo "$as_me:1774: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1726,24 +1783,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1729: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1786: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1736: result: $ac_cv_objext" >&5 +echo "$as_me:1793: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1740: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1797: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1746 "configure" +#line 1803 "configure" #include "confdefs.h" int @@ -1758,16 +1815,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1761: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1818: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1764: \$? = $ac_status" >&5 + echo "$as_me:1821: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1767: \"$ac_try\"") >&5 + { (eval echo "$as_me:1824: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1770: \$? = $ac_status" >&5 + echo "$as_me:1827: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1779,19 +1836,19 @@ rm -f conftest.$ac_objext conftest.$ac_e ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1782: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1839: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1788: checking whether $CC accepts -g" >&5 +echo "$as_me:1845: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1794 "configure" +#line 1851 "configure" #include "confdefs.h" int @@ -1803,16 +1860,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1806: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1809: \$? = $ac_status" >&5 + echo "$as_me:1866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1812: \"$ac_try\"") >&5 + { (eval echo "$as_me:1869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1815: \$? = $ac_status" >&5 + echo "$as_me:1872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1822,7 +1879,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1825: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1882: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1849,16 +1906,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1852: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1909: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1855: \$? = $ac_status" >&5 + echo "$as_me:1912: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1858: \"$ac_try\"") >&5 + { (eval echo "$as_me:1915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1861: \$? = $ac_status" >&5 + echo "$as_me:1918: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1870,7 +1927,7 @@ if { (eval echo "$as_me:1852: \"$ac_comp 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1873 "configure" +#line 1930 "configure" #include "confdefs.h" #include $ac_declaration @@ -1883,16 +1940,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1889: \$? = $ac_status" >&5 + echo "$as_me:1946: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1892: \"$ac_try\"") >&5 + { (eval echo "$as_me:1949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1895: \$? = $ac_status" >&5 + echo "$as_me:1952: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1902,7 +1959,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1905 "configure" +#line 1962 "configure" #include "confdefs.h" $ac_declaration int @@ -1914,16 +1971,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1917: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1974: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1920: \$? = $ac_status" >&5 + echo "$as_me:1977: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1923: \"$ac_try\"") >&5 + { (eval echo "$as_me:1980: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1926: \$? = $ac_status" >&5 + echo "$as_me:1983: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1962,7 +2019,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1965: checking for a BSD compatible install" >&5 +echo "$as_me:2022: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2011,7 +2068,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2014: result: $INSTALL" >&5 +echo "$as_me:2071: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2022,7 +2079,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2025: checking for socket in -lsocket" >&5 +echo "$as_me:2082: checking for socket in -lsocket" >&5 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2030,7 +2087,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2033 "configure" +#line 2090 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2049,16 +2106,16 @@ socket (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2052: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2055: \$? = $ac_status" >&5 + echo "$as_me:2112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2058: \"$ac_try\"") >&5 + { (eval echo "$as_me:2115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2061: \$? = $ac_status" >&5 + echo "$as_me:2118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_socket=yes else @@ -2069,7 +2126,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2072: result: $ac_cv_lib_socket_socket" >&5 +echo "$as_me:2129: result: $ac_cv_lib_socket_socket" >&5 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 if test $ac_cv_lib_socket_socket = yes; then cat >>confdefs.h <&5 +echo "$as_me:2140: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2088,7 +2145,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2091 "configure" +#line 2148 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2107,16 +2164,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2110: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2167: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2113: \$? = $ac_status" >&5 + echo "$as_me:2170: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2116: \"$ac_try\"") >&5 + { (eval echo "$as_me:2173: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2119: \$? = $ac_status" >&5 + echo "$as_me:2176: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -2127,7 +2184,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2130: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:2187: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then cat >>confdefs.h <>confdefs.h <<\EOF +#define WIN32_LEAN_AND_MEAN 1 +EOF + +echo "$as_me:2212: checking for main in -lws2_32" >&5 +echo $ECHO_N "checking for main in -lws2_32... $ECHO_C" >&6 +if test "${ac_cv_lib_ws2_32_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lws2_32 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 2220 "configure" +#include "confdefs.h" + +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2232: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2235: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2238: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2241: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ws2_32_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ws2_32_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2252: result: $ac_cv_lib_ws2_32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_ws2_32_main" >&6 +if test $ac_cv_lib_ws2_32_main = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for main in -liphlpapi... $ECHO_C" >&6 +if test "${ac_cv_lib_iphlpapi_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-liphlpapi $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 2271 "configure" +#include "confdefs.h" + +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2283: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2286: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2292: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_iphlpapi_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_iphlpapi_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2303: result: $ac_cv_lib_iphlpapi_main" >&5 +echo "${ECHO_T}$ac_cv_lib_iphlpapi_main" >&6 +if test $ac_cv_lib_iphlpapi_main = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF +#define snprintf _snprintf +EOF + + else + { { echo "$as_me:2319: error: need MingW32 package to build under Cygwin" >&5 +echo "$as_me: error: need MingW32 package to build under Cygwin" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:2323: checking for WinPcap developer's pack" >&5 +echo $ECHO_N "checking for WinPcap developer's pack... $ECHO_C" >&6 + +# Check whether --with-wpdpack or --without-wpdpack was given. +if test "${with_wpdpack+set}" = set; then + withval="$with_wpdpack" + echo "$as_me:2329: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 + if test -f $withval/include/packet32.h -a -f $withval/lib/packet.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + CFLAGS="$CFLAGS -I$withval/include" + LIBS="$LIBS -L$withval/lib -lpacket" + else + { { echo "$as_me:2337: error: packet32.h or packet.a not found in $withval" >&5 +echo "$as_me: error: packet32.h or packet.a not found in $withval" >&2;} + { (exit 1); exit 1; }; } + fi +else + for dir in ${prefix} ${HOME}/WPdpack ; do + if test -f ${dir}/include/packet32.h -a -f ${dir}/lib/packet.a; then + CFLAGS="$CFLAGS -I${dir}/include" + LIBS="$LIBS -L${dir}/lib -lpacket" + have_pcap=yes + break; + fi + done + if test "$have_pcap" != yes; then + { { echo "$as_me:2351: error: WinPcap developer's pack not found" >&5 +echo "$as_me: error: WinPcap developer's pack not found" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:2355: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +fi; +fi + for ac_func in inet_aton inet_pton strsep getaddrinfo getnameinfo strlcpy strlcat arc4random do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:2144: checking for $ac_func" >&5 +echo "$as_me:2363: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2150 "configure" +#line 2369 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -2178,16 +2397,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2181: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2400: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2184: \$? = $ac_status" >&5 + echo "$as_me:2403: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2187: \"$ac_try\"") >&5 + { (eval echo "$as_me:2406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2190: \$? = $ac_status" >&5 + echo "$as_me:2409: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -2197,7 +2416,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2200: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:2419: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:2436: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2223 "configure" +#line 2442 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -2251,16 +2470,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2254: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2473: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2257: \$? = $ac_status" >&5 + echo "$as_me:2476: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2260: \"$ac_try\"") >&5 + { (eval echo "$as_me:2479: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2263: \$? = $ac_status" >&5 + echo "$as_me:2482: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -2270,7 +2489,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2273: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:2492: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:2512: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2299 "configure" +#line 2518 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -2327,16 +2546,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2330: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2549: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2333: \$? = $ac_status" >&5 + echo "$as_me:2552: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2336: \"$ac_try\"") >&5 + { (eval echo "$as_me:2555: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2339: \$? = $ac_status" >&5 + echo "$as_me:2558: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -2346,7 +2565,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2349: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:2568: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:2584: checking for libpcap" >&5 echo $ECHO_N "checking for libpcap... $ECHO_C" >&6 # Check whether --with-libpcap or --without-libpcap was given. @@ -2370,11 +2589,11 @@ if test "${with_libpcap+set}" = set; the withval="$with_libpcap" case "$withval" in yes|no) - echo "$as_me:2373: result: no" >&5 + echo "$as_me:2592: result: no" >&5 echo "${ECHO_T}no" >&6 ;; *) - echo "$as_me:2377: result: $withval" >&5 + echo "$as_me:2596: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 if test -f $withval/pcap.h -a -f $withval/libpcap.a; then owd=`pwd` @@ -2382,7 +2601,7 @@ echo "${ECHO_T}$withval" >&6 PCAPINC="-I$withval -I$withval/bpf" PCAPLIB="-L$withval -lpcap" else - { { echo "$as_me:2385: error: pcap.h or libpcap.a not found in $withval" >&5 + { { echo "$as_me:2604: error: pcap.h or libpcap.a not found in $withval" >&5 echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -2398,13 +2617,13 @@ else elif test -f /usr/include/pcap.h; then PCAPLIB="-lpcap" else - echo "$as_me:2401: result: no" >&5 + echo "$as_me:2620: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:2403: error: libpcap not found" >&5 + { { echo "$as_me:2622: error: libpcap not found" >&5 echo "$as_me: error: libpcap not found" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:2407: result: yes" >&5 + echo "$as_me:2626: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi; @@ -2414,14 +2633,14 @@ if test "${with_libdnet+set}" = set; the withval="$with_libdnet" case "$withval" in yes|no) - { { echo "$as_me:2417: error: Please specify directory containing dnet-config when using --with-libdnet" >&5 + { { echo "$as_me:2636: error: Please specify directory containing dnet-config when using --with-libdnet" >&5 echo "$as_me: error: Please specify directory containing dnet-config when using --with-libdnet" >&2;} { (exit 1); exit 1; }; } ;; *) - echo "$as_me:2422: checking for libdnet" >&5 + echo "$as_me:2641: checking for libdnet" >&5 echo $ECHO_N "checking for libdnet... $ECHO_C" >&6 - echo "$as_me:2424: result: $withval" >&5 + echo "$as_me:2643: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 if test -f $withval/src/libdnet.a; then DNETINC="-I$withval/include" @@ -2430,20 +2649,20 @@ echo "${ECHO_T}$withval" >&6 DNETINC="`$withval/bin/dnet-config --cflags`" DNETLIB="`$withval/bin/dnet-config --libs`" else - echo "$as_me:2433: result: no" >&5 + echo "$as_me:2652: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:2435: error: dnet-config not found in $withval/bin" >&5 + { { echo "$as_me:2654: error: dnet-config not found in $withval/bin" >&5 echo "$as_me: error: dnet-config not found in $withval/bin" >&2;} { (exit 1); exit 1; }; } fi ;; esac - echo "$as_me:2441: result: yes" >&5 + echo "$as_me:2660: result: yes" >&5 echo "${ECHO_T}yes" >&6 else # Extract the first word of "dnet-config", so it can be a program name with args. set dummy dnet-config; ac_word=$2 -echo "$as_me:2446: checking for $ac_word" >&5 +echo "$as_me:2665: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_dnetconfig+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2460,7 +2679,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_dnetconfig="$ac_dir/$ac_word" - echo "$as_me:2463: found $ac_dir/$ac_word" >&5 + echo "$as_me:2682: found $ac_dir/$ac_word" >&5 break fi done @@ -2472,15 +2691,15 @@ fi dnetconfig=$ac_cv_path_dnetconfig if test -n "$dnetconfig"; then - echo "$as_me:2475: result: $dnetconfig" >&5 + echo "$as_me:2694: result: $dnetconfig" >&5 echo "${ECHO_T}$dnetconfig" >&6 else - echo "$as_me:2478: result: no" >&5 + echo "$as_me:2697: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$dnetconfig" = "no"; then - { { echo "$as_me:2483: error: dnet-config not found" >&5 + { { echo "$as_me:2702: error: dnet-config not found" >&5 echo "$as_me: error: dnet-config not found" >&2;} { (exit 1); exit 1; }; } else @@ -2490,10 +2709,10 @@ echo "$as_me: error: dnet-config not fou fi; -echo "$as_me:2493: checking whether libdnet is a libdumbnet" >&5 +echo "$as_me:2712: checking whether libdnet is a libdumbnet" >&5 echo $ECHO_N "checking whether libdnet is a libdumbnet... $ECHO_C" >&6 if test `echo $DNETLIB | sed -e '/dumb/=;d'`; then - echo "$as_me:2496: result: yes" >&5 + echo "$as_me:2715: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -2502,7 +2721,7 @@ EOF DNETCOMPAT="compat/libdnet" else - echo "$as_me:2505: result: no" >&5 + echo "$as_me:2724: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2514,14 +2733,14 @@ else fi LIBS=$DNETLIB - echo "$as_me:2517: checking for working addr_pton in libdnet" >&5 + echo "$as_me:2736: checking for working addr_pton in libdnet" >&5 echo $ECHO_N "checking for working addr_pton in libdnet... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - echo "$as_me:2520: result: yes" >&5 + echo "$as_me:2739: result: yes" >&5 echo "${ECHO_T}yes" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2524 "configure" +#line 2743 "configure" #include "confdefs.h" #include #include @@ -2537,28 +2756,27 @@ main(int argc, char **argv) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:2540: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2759: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2543: \$? = $ac_status" >&5 + echo "$as_me:2762: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2545: \"$ac_try\"") >&5 + { (eval echo "$as_me:2764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2548: \$? = $ac_status" >&5 + echo "$as_me:2767: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:2550: result: yes" >&5 + echo "$as_me:2769: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2561: checking for libevent" >&5 +echo "$as_me:2779: checking for libevent" >&5 echo $ECHO_N "checking for libevent... $ECHO_C" >&6 # Check whether --with-libevent or --without-libevent was given. @@ -2566,11 +2784,11 @@ if test "${with_libevent+set}" = set; th withval="$with_libevent" case "$withval" in yes|no) - echo "$as_me:2569: result: no" >&5 + echo "$as_me:2787: result: no" >&5 echo "${ECHO_T}no" >&6 ;; *) - echo "$as_me:2573: result: $withval" >&5 + echo "$as_me:2791: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 if test -f $withval/event.h -a -f $withval/libevent.a; then owd=`pwd` @@ -2578,7 +2796,7 @@ echo "${ECHO_T}$withval" >&6 EVENTINC="-I$withval" EVENTLIB="-L$withval -levent" else - { { echo "$as_me:2581: error: event.h or libevent.a not found in $withval" >&5 + { { echo "$as_me:2799: error: event.h or libevent.a not found in $withval" >&5 echo "$as_me: error: event.h or libevent.a not found in $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -2594,13 +2812,13 @@ else elif test -f /usr/include/event.h; then EVENTLIB="-levent" else - echo "$as_me:2597: result: no" >&5 + echo "$as_me:2815: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:2599: error: libevent not found" >&5 + { { echo "$as_me:2817: error: libevent not found" >&5 echo "$as_me: error: libevent not found" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:2603: result: yes" >&5 + echo "$as_me:2821: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi; @@ -2608,10 +2826,10 @@ fi; CFLAGS=$EVENTINC LIBS=$EVENTLIB - echo "$as_me:2611: checking for bufferevent in libevent" >&5 + echo "$as_me:2829: checking for bufferevent in libevent" >&5 echo $ECHO_N "checking for bufferevent in libevent... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 2614 "configure" +#line 2832 "configure" #include "confdefs.h" #include @@ -2630,24 +2848,24 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2633: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2636: \$? = $ac_status" >&5 + echo "$as_me:2854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2639: \"$ac_try\"") >&5 + { (eval echo "$as_me:2857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2642: \$? = $ac_status" >&5 + echo "$as_me:2860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:2644: result: yes" >&5 + echo "$as_me:2862: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:2650: error: you need to install a more recent version of libevent, + { { echo "$as_me:2868: error: you need to install a more recent version of libevent, check http://www.monkey.org/~provos/libevent/" >&5 echo "$as_me: error: you need to install a more recent version of libevent, check http://www.monkey.org/~provos/libevent/" >&2;} @@ -2664,7 +2882,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2667: checking how to run the C preprocessor" >&5 +echo "$as_me:2885: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2685,18 +2903,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2688 "configure" +#line 2906 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2693: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2911: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2699: \$? = $ac_status" >&5 + echo "$as_me:2917: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2719,17 +2937,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2722 "configure" +#line 2940 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2726: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2944: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2732: \$? = $ac_status" >&5 + echo "$as_me:2950: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2766,7 +2984,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2769: result: $CPP" >&5 +echo "$as_me:2987: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2776,18 +2994,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2779 "configure" +#line 2997 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2784: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3002: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2790: \$? = $ac_status" >&5 + echo "$as_me:3008: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2810,17 +3028,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2813 "configure" +#line 3031 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2817: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3035: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2823: \$? = $ac_status" >&5 + echo "$as_me:3041: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2848,7 +3066,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2851: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:3069: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2859,13 +3077,13 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2862: checking for ANSI C header files" >&5 +echo "$as_me:3080: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2868 "configure" +#line 3086 "configure" #include "confdefs.h" #include #include @@ -2873,13 +3091,13 @@ else #include _ACEOF -if { (eval echo "$as_me:2876: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3094: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2882: \$? = $ac_status" >&5 + echo "$as_me:3100: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2901,7 +3119,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 2904 "configure" +#line 3122 "configure" #include "confdefs.h" #include @@ -2919,7 +3137,7 @@ 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 <<_ACEOF -#line 2922 "configure" +#line 3140 "configure" #include "confdefs.h" #include @@ -2940,7 +3158,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 2943 "configure" +#line 3161 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -2966,15 +3184,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:2969: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3187: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2972: \$? = $ac_status" >&5 + echo "$as_me:3190: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2974: \"$ac_try\"") >&5 + { (eval echo "$as_me:3192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2977: \$? = $ac_status" >&5 + echo "$as_me:3195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2987,7 +3205,7 @@ rm -f core core.* *.core conftest$ac_exe fi fi fi -echo "$as_me:2990: result: $ac_cv_header_stdc" >&5 +echo "$as_me:3208: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -2997,13 +3215,13 @@ EOF fi -echo "$as_me:3000: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "$as_me:3218: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3006 "configure" +#line 3224 "configure" #include "confdefs.h" #include #include @@ -3025,16 +3243,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3028: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3246: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3031: \$? = $ac_status" >&5 + echo "$as_me:3249: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3034: \"$ac_try\"") >&5 + { (eval echo "$as_me:3252: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3037: \$? = $ac_status" >&5 + echo "$as_me:3255: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else @@ -3044,7 +3262,7 @@ ac_cv_header_sys_wait_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3047: result: $ac_cv_header_sys_wait_h" >&5 +echo "$as_me:3265: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then @@ -3057,23 +3275,23 @@ fi for ac_header in fcntl.h sys/ioctl.h sys/time.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3060: checking for $ac_header" >&5 +echo "$as_me:3278: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3066 "configure" +#line 3284 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3070: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3288: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3076: \$? = $ac_status" >&5 + echo "$as_me:3294: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3092,7 +3310,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3095: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3313: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3324: checking for sys/select.h" >&5 echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6 if test "${ac_cv_header_sys_select_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3112 "configure" +#line 3330 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:3116: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3334: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3122: \$? = $ac_status" >&5 + echo "$as_me:3340: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3138,17 +3356,17 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3141: result: $ac_cv_header_sys_select_h" >&5 +echo "$as_me:3359: result: $ac_cv_header_sys_select_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6 if test $ac_cv_header_sys_select_h = yes; then havesysselect=yes fi if test $havesysselect = yes; then - echo "$as_me:3148: checking for fd_mask in sys/select.h" >&5 + echo "$as_me:3366: checking for fd_mask in sys/select.h" >&5 echo $ECHO_N "checking for fd_mask in sys/select.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3151 "configure" +#line 3369 "configure" #include "confdefs.h" #include @@ -3159,10 +3377,10 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& #define HAVE_FDMASK_IN_SELECT 1 EOF - echo "$as_me:3162: result: yes" >&5 + echo "$as_me:3380: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3165: result: no" >&5 + echo "$as_me:3383: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* @@ -3174,28 +3392,28 @@ for ac_header in sys/types.h sys/stat.h inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3177: checking for $ac_header" >&5 +echo "$as_me:3395: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3183 "configure" +#line 3401 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3189: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3407: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3192: \$? = $ac_status" >&5 + echo "$as_me:3410: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3195: \"$ac_try\"") >&5 + { (eval echo "$as_me:3413: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3198: \$? = $ac_status" >&5 + echo "$as_me:3416: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -3205,7 +3423,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3208: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3426: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3436: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3224 "configure" +#line 3442 "configure" #include "confdefs.h" $ac_includes_default int @@ -3236,16 +3454,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3239: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3457: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3242: \$? = $ac_status" >&5 + echo "$as_me:3460: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3245: \"$ac_try\"") >&5 + { (eval echo "$as_me:3463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3248: \$? = $ac_status" >&5 + echo "$as_me:3466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -3255,7 +3473,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3258: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:3476: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : @@ -3267,13 +3485,13 @@ EOF fi -echo "$as_me:3270: checking for size_t" >&5 +echo "$as_me:3488: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3276 "configure" +#line 3494 "configure" #include "confdefs.h" $ac_includes_default int @@ -3288,16 +3506,16 @@ if (sizeof (size_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3291: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3509: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3294: \$? = $ac_status" >&5 + echo "$as_me:3512: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3297: \"$ac_try\"") >&5 + { (eval echo "$as_me:3515: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3300: \$? = $ac_status" >&5 + echo "$as_me:3518: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else @@ -3307,7 +3525,7 @@ ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3310: result: $ac_cv_type_size_t" >&5 +echo "$as_me:3528: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : @@ -3319,13 +3537,13 @@ EOF fi -echo "$as_me:3322: checking for u_int64_t" >&5 +echo "$as_me:3540: checking for u_int64_t" >&5 echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6 if test "${ac_cv_type_u_int64_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3328 "configure" +#line 3546 "configure" #include "confdefs.h" $ac_includes_default int @@ -3340,16 +3558,16 @@ if (sizeof (u_int64_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3343: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3561: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3346: \$? = $ac_status" >&5 + echo "$as_me:3564: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3349: \"$ac_try\"") >&5 + { (eval echo "$as_me:3567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3352: \$? = $ac_status" >&5 + echo "$as_me:3570: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_u_int64_t=yes else @@ -3359,7 +3577,7 @@ ac_cv_type_u_int64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3362: result: $ac_cv_type_u_int64_t" >&5 +echo "$as_me:3580: result: $ac_cv_type_u_int64_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6 if test $ac_cv_type_u_int64_t = yes; then : @@ -3371,13 +3589,13 @@ EOF fi -echo "$as_me:3374: checking for u_int32_t" >&5 +echo "$as_me:3592: checking for u_int32_t" >&5 echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6 if test "${ac_cv_type_u_int32_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3380 "configure" +#line 3598 "configure" #include "confdefs.h" $ac_includes_default int @@ -3392,16 +3610,16 @@ if (sizeof (u_int32_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3395: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3613: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3398: \$? = $ac_status" >&5 + echo "$as_me:3616: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3401: \"$ac_try\"") >&5 + { (eval echo "$as_me:3619: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3404: \$? = $ac_status" >&5 + echo "$as_me:3622: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_u_int32_t=yes else @@ -3411,7 +3629,7 @@ ac_cv_type_u_int32_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3414: result: $ac_cv_type_u_int32_t" >&5 +echo "$as_me:3632: result: $ac_cv_type_u_int32_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6 if test $ac_cv_type_u_int32_t = yes; then : @@ -3423,13 +3641,13 @@ EOF fi -echo "$as_me:3426: checking for u_int16_t" >&5 +echo "$as_me:3644: checking for u_int16_t" >&5 echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6 if test "${ac_cv_type_u_int16_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3432 "configure" +#line 3650 "configure" #include "confdefs.h" $ac_includes_default int @@ -3444,16 +3662,16 @@ if (sizeof (u_int16_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3447: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3665: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3450: \$? = $ac_status" >&5 + echo "$as_me:3668: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3453: \"$ac_try\"") >&5 + { (eval echo "$as_me:3671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3456: \$? = $ac_status" >&5 + echo "$as_me:3674: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_u_int16_t=yes else @@ -3463,7 +3681,7 @@ ac_cv_type_u_int16_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3466: result: $ac_cv_type_u_int16_t" >&5 +echo "$as_me:3684: result: $ac_cv_type_u_int16_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6 if test $ac_cv_type_u_int16_t = yes; then : @@ -3475,13 +3693,13 @@ EOF fi -echo "$as_me:3478: checking for u_int8_t" >&5 +echo "$as_me:3696: checking for u_int8_t" >&5 echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6 if test "${ac_cv_type_u_int8_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3484 "configure" +#line 3702 "configure" #include "confdefs.h" $ac_includes_default int @@ -3496,16 +3714,16 @@ if (sizeof (u_int8_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3499: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3717: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3502: \$? = $ac_status" >&5 + echo "$as_me:3720: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3505: \"$ac_try\"") >&5 + { (eval echo "$as_me:3723: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3508: \$? = $ac_status" >&5 + echo "$as_me:3726: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_u_int8_t=yes else @@ -3515,7 +3733,7 @@ ac_cv_type_u_int8_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3518: result: $ac_cv_type_u_int8_t" >&5 +echo "$as_me:3736: result: $ac_cv_type_u_int8_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6 if test $ac_cv_type_u_int8_t = yes; then : @@ -3527,13 +3745,13 @@ EOF fi -echo "$as_me:3530: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:3748: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3536 "configure" +#line 3754 "configure" #include "confdefs.h" #include #include @@ -3549,16 +3767,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3552: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3770: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3555: \$? = $ac_status" >&5 + echo "$as_me:3773: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3558: \"$ac_try\"") >&5 + { (eval echo "$as_me:3776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3561: \$? = $ac_status" >&5 + echo "$as_me:3779: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -3568,7 +3786,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3571: result: $ac_cv_header_time" >&5 +echo "$as_me:3789: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -3578,10 +3796,10 @@ EOF fi -echo "$as_me:3581: checking for struct sockaddr_storage in sys/socket.h" >&5 +echo "$as_me:3799: checking for struct sockaddr_storage in sys/socket.h" >&5 echo $ECHO_N "checking for struct sockaddr_storage in sys/socket.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3584 "configure" +#line 3802 "configure" #include "confdefs.h" #include @@ -3592,19 +3810,19 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& #define HAVE_SOCKADDR_STORAGE 1 EOF - echo "$as_me:3595: result: yes" >&5 + echo "$as_me:3813: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3598: result: no" >&5 + echo "$as_me:3816: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* -echo "$as_me:3604: checking for struct addrinfo in netdb.h" >&5 +echo "$as_me:3822: checking for struct addrinfo in netdb.h" >&5 echo $ECHO_N "checking for struct addrinfo in netdb.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3607 "configure" +#line 3825 "configure" #include "confdefs.h" #include @@ -3615,19 +3833,19 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& #define HAVE_STRUCT_ADDRINFO 1 EOF - echo "$as_me:3618: result: yes" >&5 + echo "$as_me:3836: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3621: result: no" >&5 + echo "$as_me:3839: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* -echo "$as_me:3627: checking for timeradd in sys/time.h" >&5 +echo "$as_me:3845: checking for timeradd in sys/time.h" >&5 echo $ECHO_N "checking for timeradd in sys/time.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3630 "configure" +#line 3848 "configure" #include "confdefs.h" #include @@ -3642,19 +3860,19 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& #define HAVE_TIMERADD 1 EOF - echo "$as_me:3645: result: yes" >&5 + echo "$as_me:3863: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3648: result: no" >&5 + echo "$as_me:3866: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* -echo "$as_me:3654: checking for byte order of raw socket I/O" >&5 +echo "$as_me:3872: checking for byte order of raw socket I/O" >&5 echo $ECHO_N "checking for byte order of raw socket I/O... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3657 "configure" +#line 3875 "configure" #include "confdefs.h" #include @@ -3666,7 +3884,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then cat >conftest.$ac_ext <<_ACEOF -#line 3669 "configure" +#line 3887 "configure" #include "confdefs.h" #include #ifdef OpenBSD @@ -3676,30 +3894,30 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - echo "$as_me:3679: result: good byte order" >&5 + echo "$as_me:3897: result: good byte order" >&5 echo "${ECHO_T}good byte order" >&6 else cat >>confdefs.h <<\EOF #define BSD_RAWSOCK_ORDER 1 EOF - echo "$as_me:3686: result: bad byte order" >&5 + echo "$as_me:3904: result: bad byte order" >&5 echo "${ECHO_T}bad byte order" >&6 fi rm -f conftest* else - echo "$as_me:3693: result: good byte order" >&5 + echo "$as_me:3911: result: good byte order" >&5 echo "${ECHO_T}good byte order" >&6 fi rm -f conftest* -echo "$as_me:3699: checking for sin_len in struct sockaddr_in" >&5 +echo "$as_me:3917: checking for sin_len in struct sockaddr_in" >&5 echo $ECHO_N "checking for sin_len in struct sockaddr_in... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3702 "configure" +#line 3920 "configure" #include "confdefs.h" #include @@ -3714,18 +3932,18 @@ void *p = &((struct sockaddr_in *)0L)->s } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3717: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3935: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3720: \$? = $ac_status" >&5 + echo "$as_me:3938: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3723: \"$ac_try\"") >&5 + { (eval echo "$as_me:3941: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3726: \$? = $ac_status" >&5 + echo "$as_me:3944: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3728: result: yes" >&5 + echo "$as_me:3946: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -3735,16 +3953,16 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3738: result: no" >&5 +echo "$as_me:3956: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:3744: checking for sa_family_t" >&5 +echo "$as_me:3962: checking for sa_family_t" >&5 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3747 "configure" +#line 3965 "configure" #include "confdefs.h" #include @@ -3758,23 +3976,23 @@ sa_family_t x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3761: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3979: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3764: \$? = $ac_status" >&5 + echo "$as_me:3982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3767: \"$ac_try\"") >&5 + { (eval echo "$as_me:3985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3770: \$? = $ac_status" >&5 + echo "$as_me:3988: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3772: result: yes" >&5 + echo "$as_me:3990: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3777: result: no" >&5 +echo "$as_me:3995: result: no" >&5 echo "${ECHO_T}no" >&6 cat >>confdefs.h <<\EOF #define sa_family_t int @@ -3783,10 +4001,10 @@ EOF fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:3786: checking for socklen_t" >&5 +echo "$as_me:4004: checking for socklen_t" >&5 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3789 "configure" +#line 4007 "configure" #include "confdefs.h" #include @@ -3800,23 +4018,23 @@ socklen_t x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3803: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4021: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3806: \$? = $ac_status" >&5 + echo "$as_me:4024: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3809: \"$ac_try\"") >&5 + { (eval echo "$as_me:4027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3812: \$? = $ac_status" >&5 + echo "$as_me:4030: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3814: result: yes" >&5 + echo "$as_me:4032: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3819: result: no" >&5 +echo "$as_me:4037: result: no" >&5 echo "${ECHO_T}no" >&6 cat >>confdefs.h <<\EOF #define socklen_t int @@ -3825,10 +4043,10 @@ EOF fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:3828: checking for NI_NUMERICHOST" >&5 +echo "$as_me:4046: checking for NI_NUMERICHOST" >&5 echo $ECHO_N "checking for NI_NUMERICHOST... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3831 "configure" +#line 4049 "configure" #include "confdefs.h" #include @@ -3843,23 +4061,23 @@ char x[NI_NUMERICHOST]; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3846: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4064: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3849: \$? = $ac_status" >&5 + echo "$as_me:4067: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3852: \"$ac_try\"") >&5 + { (eval echo "$as_me:4070: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3855: \$? = $ac_status" >&5 + echo "$as_me:4073: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3857: result: yes" >&5 + echo "$as_me:4075: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3862: result: no" >&5 +echo "$as_me:4080: result: no" >&5 echo "${ECHO_T}no" >&6 cat >>confdefs.h <<\EOF #define NI_NUMERICHOST 1 @@ -3872,10 +4090,10 @@ EOF fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:3875: checking for NI_MAXSERV" >&5 +echo "$as_me:4093: checking for NI_MAXSERV" >&5 echo $ECHO_N "checking for NI_MAXSERV... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3878 "configure" +#line 4096 "configure" #include "confdefs.h" #include @@ -3890,23 +4108,23 @@ char x[NI_MAXSERV]; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3893: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4111: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3896: \$? = $ac_status" >&5 + echo "$as_me:4114: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3899: \"$ac_try\"") >&5 + { (eval echo "$as_me:4117: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3902: \$? = $ac_status" >&5 + echo "$as_me:4120: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3904: result: yes" >&5 + echo "$as_me:4122: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3909: result: no" >&5 +echo "$as_me:4127: result: no" >&5 echo "${ECHO_T}no" >&6 cat >>confdefs.h <<\EOF #define NI_MAXSERV 32 @@ -3915,13 +4133,13 @@ EOF fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:3918: checking return type of signal handlers" >&5 +echo "$as_me:4136: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3924 "configure" +#line 4142 "configure" #include "confdefs.h" #include #include @@ -3943,16 +4161,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3946: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4164: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3949: \$? = $ac_status" >&5 + echo "$as_me:4167: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3952: \"$ac_try\"") >&5 + { (eval echo "$as_me:4170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3955: \$? = $ac_status" >&5 + echo "$as_me:4173: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -3962,7 +4180,7 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3965: result: $ac_cv_type_signal" >&5 +echo "$as_me:4183: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <&5 +echo "$as_me:4193: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3981 "configure" +#line 4199 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4009,16 +4227,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4012: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4230: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4015: \$? = $ac_status" >&5 + echo "$as_me:4233: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4018: \"$ac_try\"") >&5 + { (eval echo "$as_me:4236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4021: \$? = $ac_status" >&5 + echo "$as_me:4239: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4028,7 +4246,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4031: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4249: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +{ echo "$as_me:4339: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -4294,7 +4512,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:4297: error: ambiguous option: $1 + { { echo "$as_me:4515: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -4313,7 +4531,7 @@ Try \`$0 --help' for more information." ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:4316: error: unrecognized option: $1 + -*) { { echo "$as_me:4534: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -4358,7 +4576,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:4361: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:4579: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -4451,6 +4669,14 @@ s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t s,@SET_MAKE@,$SET_MAKE,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -4582,7 +4808,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:4585: creating $ac_file" >&5 + { echo "$as_me:4811: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -4600,7 +4826,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4603: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4829: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4613,7 +4839,7 @@ echo "$as_me: error: cannot find input f echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4616: error: cannot find input file: $f" >&5 + { { echo "$as_me:4842: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4674,7 +4900,7 @@ for ac_file in : $CONFIG_HEADERS; do tes * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:4677: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:4903: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -4685,7 +4911,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4688: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4914: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4698,7 +4924,7 @@ echo "$as_me: error: cannot find input f echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4701: error: cannot find input file: $f" >&5 + { { echo "$as_me:4927: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4815,7 +5041,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:4818: $ac_file is unchanged" >&5 + { echo "$as_me:5044: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff -pruN 2.0-4.1/configure.in 2.1-0ubuntu8/configure.in --- 2.0-4.1/configure.in 2004-04-08 03:15:26.000000000 +0000 +++ 2.1-0ubuntu8/configure.in 2005-03-05 19:21:27.000000000 +0000 @@ -2,9 +2,14 @@ dnl Process this file with autoconf to p AC_INIT(scanssh) AC_CONFIG_SRCDIR(scanssh.c) -AM_INIT_AUTOMAKE(scanssh, 2.0) +AM_INIT_AUTOMAKE(scanssh, 2.1) AM_CONFIG_HEADER(config.h) +dnl Check for system type. +dnl XXX - we do this to qualify our later feature checks, since some +dnl systems claim to support multiple features, but are quite b0rked. +AC_CANONICAL_HOST + dnl Initialize prefix. if test "$prefix" = "NONE"; then prefix="/usr/local" @@ -18,6 +23,47 @@ dnl XXX - Solaris sux. AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) +dnl XXX - we need WinPcap developer's pack under Cygwin for win32 +AC_CYGWIN +if test "$CYGWIN" = yes ; then + if test -d /usr/include/mingw ; then + CPPFLAGS="$CPPFLAGS -mno-cygwin" + CFLAGS="$CFLAGS -mno-cygwin" + AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, + [Define for faster code generation.]) + AC_CHECK_LIB(ws2_32, main) + AC_CHECK_LIB(iphlpapi, main) + AC_DEFINE(snprintf, _snprintf, + [Use MingW32's internal snprintf]) + else + AC_MSG_ERROR([need MingW32 package to build under Cygwin]) + fi + AC_MSG_CHECKING(for WinPcap developer's pack) + AC_ARG_WITH(wpdpack, + [ --with-wpdpack=DIR use WinPcap developer's pack in DIR], + [ AC_MSG_RESULT($withval) + if test -f $withval/include/packet32.h -a -f $withval/lib/packet.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + CFLAGS="$CFLAGS -I$withval/include" + LIBS="$LIBS -L$withval/lib -lpacket" + else + AC_MSG_ERROR(packet32.h or packet.a not found in $withval) + fi ], + [ for dir in ${prefix} ${HOME}/WPdpack ; do + if test -f ${dir}/include/packet32.h -a -f ${dir}/lib/packet.a; then + CFLAGS="$CFLAGS -I${dir}/include" + LIBS="$LIBS -L${dir}/lib -lpacket" + have_pcap=yes + break; + fi + done + if test "$have_pcap" != yes; then + AC_MSG_ERROR(WinPcap developer's pack not found) + fi + AC_MSG_RESULT(yes) ]) +fi + dnl Checks for libraries. AC_REPLACE_FUNCS(inet_aton inet_pton strsep getaddrinfo getnameinfo strlcpy strlcat arc4random) needmd5=no @@ -142,9 +188,7 @@ main(int argc, char **argv) addr_pton("0.0.0.0/0", &a1); exit(a1.addr_bits != 0); -}, AC_MSG_RESULT(yes), [ - AC_WARNING([your version of libdnet is buggy; working around it]) -], AC_MSG_RESULT(yes)) +}, AC_MSG_RESULT(yes), AC_WARNING(your version of libdnet is buggy - working around it), AC_MSG_RESULT(yes)) dnl Checks for libevent AC_MSG_CHECKING(for libevent) diff -pruN 2.0-4.1/connecter.c 2.1-0ubuntu8/connecter.c --- 2.0-4.1/connecter.c 2004-04-07 04:55:27.000000000 +0000 +++ 2.1-0ubuntu8/connecter.c 2004-11-30 02:27:44.000000000 +0000 @@ -52,6 +52,15 @@ #include #include "scanssh.h" +#include "socks.h" + +#ifdef DEBUG +extern int debug; +#define DFPRINTF(x) if (debug) fprintf x +#else +#define DFPRINTF(x) +#endif + /* Global imports */ @@ -62,6 +71,10 @@ extern char *ssh_ipalias; extern struct scanner **ss_scanners; extern int ss_nscanners; +extern struct socksq socks_host; + +extern rand_t *ss_rand; + /* Local globals */ int scan_nhosts; /* Number of hosts that we are scanning */ @@ -266,6 +279,8 @@ ssh_readcb(struct bufferevent *bev, void struct argument *arg = parameter; int res; + DFPRINTF((stderr, "%s: called\n", __func__)); + if ((res = ssh_process_line(EVBUFFER_INPUT(bev), arg)) == -1) return; @@ -285,6 +300,8 @@ ssh_writecb(struct bufferevent *bev, voi { struct argument *arg = parameter; + DFPRINTF((stderr, "%s: called\n", __func__)); + if (!ssh_sendident || (arg->a_flags & SSH_DIDWRITE)) { if (arg->a_flags & SSH_GOTREAD) scanhost_return(bev, arg, 1); @@ -309,7 +326,12 @@ ssh_errorcb(struct bufferevent *bev, sho postres(arg, state->firstline); success = 1; } else { - postres(arg, ""); + postres(arg, "", + what & EV_READ ? "read" : "write", + what & EVBUFFER_ERROR ? " EV_ERROR" : "", + what & EVBUFFER_EOF ? " EV_EOF" : "", + what & EVBUFFER_TIMEOUT ? " EV_TIMEOUT" : "", + strerror(errno)); success = 0; } scanhost_return(bev, arg, success); @@ -386,13 +408,12 @@ make_socket(int (*f)(int, const struct s return (fd); } -void -scanhost_connectcb(int fd, short what, void *parameter) +int +scanhost_check_socketerror(struct argument *arg, short what) { - struct argument *arg = parameter; - struct bufferevent *bev = NULL; int error; socklen_t errsz = sizeof(error); + int fd = arg->a_fd; if (what == EV_TIMEOUT) { postres(arg, ""); @@ -416,6 +437,19 @@ scanhost_connectcb(int fd, short what, v goto error; } + return (0); + + error: + scanhost_return(NULL, arg, 0); + return (-1); +} + +struct bufferevent * +scanhost_postconnect_setup(struct argument *arg) +{ + struct bufferevent *bev = NULL; + int fuzz; + /* We successfully connected to the host */ bev = bufferevent_new(arg->a_fd, @@ -428,11 +462,162 @@ scanhost_connectcb(int fd, short what, v goto error; } - bufferevent_settimeout(bev, SHORTWAIT, SHORTWAIT); + fuzz = rand_uint16(ss_rand) % 10; + bufferevent_settimeout(bev, SHORTWAIT + fuzz, SHORTWAIT + fuzz); bufferevent_enable(bev, EV_READ|EV_WRITE); (*arg->a_scanner->init)(bev, arg); + return (bev); + + error: + scanhost_return(NULL, arg, 0); + return (NULL); +} + +void +scanhost_connectcb(int fd, short what, void *parameter) +{ + struct argument *arg = parameter; + + if (scanhost_check_socketerror(arg, what) == -1) + return; + + scanhost_postconnect_setup(arg); +} + +static void +socks_readcb(struct bufferevent *bev, void *parameter) +{ + struct argument *arg = parameter; + struct bufferevent *newbev = NULL; + struct socks4_cmd reply; + + DFPRINTF((stderr, "%s: called\n", __func__)); + + if (EVBUFFER_LENGTH(bev->input) < sizeof(reply)) + goto error; + + bufferevent_read(bev, &reply, sizeof(reply)); + DFPRINTF((stderr, "Version: %d, Reply: %d\n", + reply.version, reply.command)); + + if (0 != reply.version) + goto error; + + switch (reply.command) { + case SOCKS4_RESP_SUCCESS: + break; + case SOCKS4_RESP_FAILURE: + postres(arg, ""); + goto done; + case SOCKS4_RESP_NOIDENT: + postres(arg, ""); + goto done; + case SOCKS4_RESP_BADIDENT: + postres(arg, ""); + goto done; + default: + postres(arg, ""); + goto done; + } + + /* We need to unregister the event's first due to a bug in libevent */ + bufferevent_disable(bev, EV_READ|EV_WRITE); + + /* Call the original connect callback to take care of the rest */ + if ((newbev = scanhost_postconnect_setup(arg)) != NULL) { + evbuffer_add_buffer(newbev->input, bev->input); + /* + * If we have more data buffered, the we need to append it + * to the new read buffer and if necessary call the read + * callback. + * Unfortunately, this assumes a lot about the internals of + * libevent. + */ + if (EVBUFFER_LENGTH(newbev->input)) + newbev->readcb(newbev, newbev->cbarg); + } + + bufferevent_free(bev); + return; + + error: + postres(arg, ""); + + done: + bufferevent_free(bev); + scanhost_return(NULL, arg, 0); +} + +static void +socks_writecb(struct bufferevent *bev, void *parameter) +{ + struct argument *arg = parameter; + struct socks4_cmd cmd; + + DFPRINTF((stderr, "%s: called\n", __func__)); + + if (arg->a_flags != 0) + return; + + /* Connect to the remote server */ + memset(&cmd, 0, sizeof(cmd)); + cmd.version = SOCKS_VERSION4; + cmd.command = SOCKS_CMD_CONNECT; + cmd.dstport = htons(arg->a_ports[0].port); + memcpy(&cmd.address.s_addr, &arg->addr.addr_ip, + sizeof(struct in_addr)); + + bufferevent_write(bev, &cmd, sizeof(cmd)); + bufferevent_write(bev, SSHUSERAGENT, sizeof(SSHUSERAGENT)); + + arg->a_flags = SOCKS_WAITING_COMMANDRESPONSE; + bufferevent_enable(bev, EV_READ); +} + +void +socks_errorcb(struct bufferevent *bev, short what, void *parameter) +{ + struct argument *arg = parameter; + + DFPRINTF((stderr, "%s: called\n", __func__)); + + postres(arg, "", + what & EV_READ ? "read" : "write", + what & EVBUFFER_ERROR ? " EV_ERROR" : "", + what & EVBUFFER_EOF ? " EV_EOF" : "", + what & EVBUFFER_TIMEOUT ? " EV_TIMEOUT" : "", + strerror(errno)); + bufferevent_free(bev), + scanhost_return(NULL, arg, -1); +} + +void +scanhost_socks_connectcb(int fd, short what, void *parameter) +{ + struct argument *arg = parameter; + struct bufferevent *bev = NULL; + + if (scanhost_check_socketerror(arg, what) == -1) + return; + + /* We successfully connected to the host */ + + bev = bufferevent_new(arg->a_fd, socks_readcb, socks_writecb, + socks_errorcb, arg); + if (bev == NULL) { + warnx("%s: bufferevent_new", __func__); + postres(arg, ""); + goto error; + } + + bufferevent_settimeout(bev, 30, 30); + bufferevent_disable(bev, EV_READ); + bufferevent_enable(bev, EV_WRITE); + + arg->a_flags = 0; + return; error: @@ -445,13 +630,30 @@ scanhost(struct argument *arg) { struct timeval tv; uint16_t port = arg->a_ports[0].port; + void (*cb)(int, short, void *); arg->a_flags = 0; - arg->a_fd = make_socket(connect, addr_ntoa(&arg->addr), port); - if (arg->a_fd == -1) - return (-1); + if (TAILQ_FIRST(&socks_host) == NULL) { + arg->a_fd = make_socket(connect, addr_ntoa(&arg->addr), port); + if (arg->a_fd == -1) + return (-1); - event_set(&arg->ev, arg->a_fd, EV_WRITE, scanhost_connectcb, arg); + cb = scanhost_connectcb; + } else { + struct socks_host *single_host = TAILQ_FIRST(&socks_host); + + /* Rotate the entries around */ + TAILQ_REMOVE(&socks_host, single_host, next); + TAILQ_INSERT_TAIL(&socks_host, single_host, next); + + arg->a_fd = make_socket(connect, + addr_ntoa(&single_host->host), single_host->port); + if (arg->a_fd == -1) + return (-1); + cb = scanhost_socks_connectcb; + } + + event_set(&arg->ev, arg->a_fd, EV_WRITE, cb, arg); timerclear(&tv); tv.tv_sec = LONGWAIT; @@ -460,9 +662,19 @@ scanhost(struct argument *arg) return (0); } +/* + * Success parameter: + * -2 - scanner timeout, stop scanning and go to next host. + * -1 - scanner reset?, stop scanning, go to next port. + * 0 - current scanner failed, continue with next scanner + * 1 - current scanner succeeded, stop scanning and report success + */ + void scanhost_return(struct bufferevent *bev, struct argument *arg, int success) { + int done = 0; + if (bev != NULL) { (*arg->a_scanner->finalize)(bev, arg); bufferevent_free(bev); @@ -477,10 +689,27 @@ scanhost_return(struct bufferevent *bev, * use a different scanner on it. */ arg->a_scanneroff++; - if (bev != NULL && !success && arg->a_scanneroff < ss_nscanners) { + if (success == -2) { + printres(arg, arg->a_ports[0].port, ""); + + /* timeout - host is down */ + while (arg->a_nports) + ports_remove(arg, arg->a_ports[0].port); + + } else if (success == -1) { + /* reset? */ + printres(arg, arg->a_ports[0].port, ""); + done = 1; + + } else if (bev != NULL && !success && + arg->a_scanneroff < ss_nscanners) { arg->a_scanner = ss_scanners[arg->a_scanneroff]; } else { printres(arg, arg->a_ports[0].port, arg->a_res); + done = 1; + } + + if (done) { arg->a_scanneroff = 0; arg->a_scanner = ss_scanners[0]; ports_remove(arg, arg->a_ports[0].port); @@ -520,13 +749,17 @@ scanhost_ready(struct argument *arg) void scanhost_fromlist(void) { + extern int max_scanqueue_size; struct argument *arg; - while (scan_nhosts < MAXSCANQUEUESZ && + while (scan_nhosts < max_scanqueue_size && (arg = TAILQ_FIRST(&readyqueue)) != NULL) { /* Out of file descriptors, we need to try again later */ - if (scanhost(arg) == -1) + if (scanhost(arg) == -1) { + TAILQ_REMOVE(&readyqueue, arg, a_next); + TAILQ_INSERT_TAIL(&readyqueue, arg, a_next); break; + } TAILQ_REMOVE(&readyqueue, arg, a_next); scan_nhosts++; diff -pruN 2.0-4.1/debian/changelog 2.1-0ubuntu8/debian/changelog --- 2.0-4.1/debian/changelog 2019-10-24 18:58:08.000000000 +0000 +++ 2.1-0ubuntu8/debian/changelog 2019-10-24 18:58:07.000000000 +0000 @@ -1,14 +1,53 @@ -scanssh (2.0-4.1) unstable; urgency=medium +scanssh (2.1-0ubuntu8) focal; urgency=medium - * Non-maintainer upload. - * Upgraded DH level to 9. (Closes: #800223) - * debian/control: - - Added the ${misc:Depends} variable to Depends field. - - Bumped Standards-Version to 3.9.6. - - Replaced from libpcap-dev to libpcap0.8-dev in - Build-Depends field. (Closes: #422558) + * No-change rebuild for libevent soname changes. - -- Joao Eriberto Mota Filho Tue, 17 Nov 2015 20:00:11 -0200 + -- Matthias Klose Sat, 19 Oct 2019 19:58:33 +0000 + +scanssh (2.1-0ubuntu7) artful; urgency=medium + + * No-change rebuild against libevent-2.1-6 + + -- Steve Langasek Mon, 31 Jul 2017 02:52:33 +0000 + +scanssh (2.1-0ubuntu6) xenial; urgency=medium + + * debian/compat: Specify compatibility level of 9. + * debian/rules: Remove legacy DH_COMPAT export. + * debian/control: Build-depend on debhelper (>= 9). + + -- Logan Rosen Sat, 05 Dec 2015 23:18:57 -0500 + +scanssh (2.1-0ubuntu5) trusty; urgency=medium + + * Use autotools-dev to update config.{sub,guess} for new arches. + + -- Logan Rosen Sun, 29 Dec 2013 22:35:26 -0500 + +scanssh (2.1-0ubuntu4) oneiric; urgency=low + + * No change rebuild against new libevent. + + -- Bhavani Shankar Sun, 10 Jul 2011 23:03:32 +0530 + +scanssh (2.1-0ubuntu3) karmic; urgency=low + + * No-change rebuild for libevent1 -> libevent-1.4-2 transition. + + -- Steve Kowalik Thu, 16 Jul 2009 15:18:13 +1000 + +scanssh (2.1-0ubuntu2) gutsy; urgency=low + + * debian/control: Update maintainer fields according to debian- + maintainer-field spec. + + -- Martin Pitt Wed, 15 Aug 2007 08:10:01 +0000 + +scanssh (2.1-0ubuntu1) breezy; urgency=low + + * New upstream release. + + -- Daniel T Chen Fri, 6 May 2005 23:38:07 -0400 scanssh (2.0-4) unstable; urgency=high diff -pruN 2.0-4.1/debian/control 2.1-0ubuntu8/debian/control --- 2.0-4.1/debian/control 2019-10-24 18:58:08.000000000 +0000 +++ 2.1-0ubuntu8/debian/control 2019-10-24 18:58:07.000000000 +0000 @@ -1,13 +1,14 @@ Source: scanssh Section: net Priority: optional -Maintainer: Rene Weber -Build-Depends: debhelper (>= 9), libpcap0.8-dev, libdumbnet-dev, libevent-dev (>= 0.8-1) -Standards-Version: 3.9.6 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Rene Weber +Build-Depends: debhelper (>= 9), autotools-dev, libpcap-dev (>= 0.6.1-2), libdumbnet-dev, libevent-dev (>= 0.8-1) +Standards-Version: 3.6.1 Package: scanssh Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${shlibs:Depends} Description: get SSH server versions for an entire network The ScanSSH protocol scanner scans a list of addresses and networks for running SSH protocol servers and their version numbers. Version 2.0 adds diff -pruN 2.0-4.1/debian/rules 2.1-0ubuntu8/debian/rules --- 2.0-4.1/debian/rules 2019-10-24 18:58:08.000000000 +0000 +++ 2.1-0ubuntu8/debian/rules 2019-10-24 18:58:07.000000000 +0000 @@ -5,8 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -18,6 +16,7 @@ endif configure: configure-stamp configure-stamp: dh_testdir + dh_autotools-dev_updateconfig # Add here commands to configure the package. ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info @@ -41,7 +40,7 @@ clean: # Add here commands to clean up after the build process. -$(MAKE) distclean rm -f config.log - + dh_autotools-dev_restoreconfig dh_clean install: build diff -pruN 2.0-4.1/http.c 2.1-0ubuntu8/http.c --- 2.0-4.1/http.c 2004-04-06 07:29:08.000000000 +0000 +++ 2.1-0ubuntu8/http.c 2004-11-05 06:39:14.000000000 +0000 @@ -116,6 +116,10 @@ http_getheaders(struct bufferevent *bev, evbuffer_drain(input, off); } + if ((arg->a_flags & HTTP_GOT_HEADERS) && + !(arg->a_flags & HTTP_GOT_OK)) + return (-1); + return (0); } @@ -233,7 +237,7 @@ http_errorcb(struct bufferevent *bev, sh DFPRINTF((stderr, "%s: called\n", __func__)); - postres(arg, ""); + postres(arg, ""); scanhost_return(bev, arg, 0); } diff -pruN 2.0-4.1/Makefile.in 2.1-0ubuntu8/Makefile.in --- 2.0-4.1/Makefile.in 2004-04-08 03:18:10.000000000 +0000 +++ 2.1-0ubuntu8/Makefile.in 2005-03-05 19:28:31.000000000 +0000 @@ -57,6 +57,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ CC = @CC@ DNETCOMPAT = @DNETCOMPAT@ DNETINC = @DNETINC@ @@ -110,10 +112,11 @@ man1dir = $(mandir)/man1 MANS = $(man_MANS) NROFF = nroff -DIST_COMMON = README ./stamp-h.in Makefile.am Makefile.in acconfig.h \ -aclocal.m4 arc4random.c config.h.in configure configure.in \ -getaddrinfo.c getnameinfo.c inet_aton.c inet_pton.c install-sh missing \ -mkinstalldirs strlcat.c strlcpy.c strsep.c +DIST_COMMON = README ./stamp-h.in Makefile.am Makefile.in TODO \ +acconfig.h aclocal.m4 arc4random.c config.guess config.h.in config.sub \ +configure configure.in getaddrinfo.c getnameinfo.c inet_aton.c \ +inet_pton.c install-sh missing mkinstalldirs strlcat.c strlcpy.c \ +strsep.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff -pruN 2.0-4.1/README 2.1-0ubuntu8/README --- 2.0-4.1/README 2004-04-08 01:59:44.000000000 +0000 +++ 2.1-0ubuntu8/README 2004-04-08 03:22:43.000000000 +0000 @@ -30,6 +30,11 @@ To build, should make you happy. +ACKNOWLEDGEMENTS +---------------- + +Thanks to Marius Eriksen for release testing. + -- Niels Provos http://www.citi.umich.edu/u/provos diff -pruN 2.0-4.1/scanssh.1 2.1-0ubuntu8/scanssh.1 --- 2.0-4.1/scanssh.1 2004-04-07 21:22:24.000000000 +0000 +++ 2.1-0ubuntu8/scanssh.1 2004-10-03 04:09:03.000000000 +0000 @@ -40,6 +40,7 @@ .Op Fl VIERph .Op Fl s Ar scanners,... .Op Fl n Ar ports,... +.Op Fl u Ar socks hosts,... .Op Fl e Ar excludefile .Ar addresses... .Sh DESCRIPTION @@ -109,6 +110,10 @@ Specifies the port numbers to scan. Ports are separated by commas. Each specified scanner is run for each port in this list. The default is 22. +.It Fl u Ar socks hosts,... +A list of comma separated host:port pairs of SOCKS proxies that +.Nm +should use to scan through. .It Fl s Ar scanners Specifies a number of scanners should be executed for each open port. Multiple scanners are separated by commas. diff -pruN 2.0-4.1/scanssh.c 2.1-0ubuntu8/scanssh.c --- 2.0-4.1/scanssh.c 2004-04-08 03:16:33.000000000 +0000 +++ 2.1-0ubuntu8/scanssh.c 2004-11-21 08:11:19.000000000 +0000 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -115,15 +116,18 @@ struct interface *ss_inter; rand_t *ss_rand; ip_t *ss_ip; +/* SOCKS servers via which we can scan */ +struct socksq socks_host; + struct scanner **ss_scanners = NULL; int ss_nscanners = 0; -struct argument *args; -int entries; +struct argument *args; /* global list of addresses */ +int entries; /* number of remaining addresses */ -int ssh_sendident; +int ssh_sendident; /* should we send ident to ssh server? */ -struct port *ss_ports = NULL; +struct port *ss_ports = NULL; /* global list of ports to be scanned */ int ss_nports = 0; int ss_nhosts = 0; /* Number of addresses generated */ @@ -134,6 +138,8 @@ struct timeval syn_start; int syn_rate = 100; int syn_nsent = 0; +int max_scanqueue_size = MAXSCANQUEUESZ; + struct address_slot slots[MAXSLOTS]; #define MAX_PROCESSES 30 @@ -321,11 +327,18 @@ printres(struct argument *exp, uint16_t } void -postres(struct argument *arg, char *result) +postres(struct argument *arg, const char *fmt, ...) { + static char buffer[1024]; + va_list ap; + + va_start(ap, fmt); + vsnprintf(buffer, sizeof(buffer), fmt, ap); + va_end(ap); + if (arg->a_res != NULL) free(arg->a_res); - if ((arg->a_res = strdup(result)) == NULL) + if ((arg->a_res = strdup(buffer)) == NULL) err(1, "%s: strdup", __func__); } @@ -934,9 +947,9 @@ probe_haswork(void) } void -probe_send(int fd, short what, void *arg) +probe_send(int fd, short what, void *parameter) { - struct event *ev = arg; + struct event *ev = parameter; struct timeval tv; int ntotal, nprobes, nsent; extern int scan_nhosts; @@ -980,10 +993,22 @@ probe_send(int fd, short what, void *arg entries--; args[entries].a_retry = 0; - synlist_insert(&args[entries]); - /* On failure, synlist_insert already scheduled a retransmit */ - synlist_probe(&args[entries], args[entries].a_ports[0].port); + if (TAILQ_FIRST(&socks_host) == NULL) { + synlist_insert(&args[entries]); + + /* + * On failure, synlist_insert already scheduled + * a retransmit. + */ + synlist_probe(&args[entries], + args[entries].a_ports[0].port); + } else { + struct argument *arg = &args[entries]; + if (!arg->a_hasports) + ports_setup(arg, arg->a_ports, arg->a_nports); + scanhost_ready(arg); + } nsent++; syn_nsent++; @@ -991,6 +1016,36 @@ probe_send(int fd, short what, void *arg } int +parse_socks_host(char *optarg) +{ + char *host; + while ((host = strsep(&optarg, ",")) != NULL) { + /* + * Parse the address of a SOCKS proxy that we are + * using for all connections. + */ + struct socks_host *single_host; + + char *address = strsep(&host, ":"); + if (host == NULL || *host == '\0') + return (-1); + + single_host = calloc(1, sizeof(struct socks_host)); + if (single_host == NULL) + err(1, "calloc"); + if (addr_pton(address, &single_host->host) == -1) + return (-1); + + if ((single_host->port = atoi(host)) == 0) + return (-1); + + TAILQ_INSERT_TAIL(&socks_host, single_host, next); + } + + return (0); +} + +int main(int argc, char **argv) { struct event ev_send; @@ -1004,8 +1059,10 @@ main(int argc, char **argv) ssh_sendident = 1; + TAILQ_INIT(&socks_host); + name = argv[0]; - while ((ch = getopt(argc, argv, "VIhdps:i:e:n:r:ER")) != -1) + while ((ch = getopt(argc, argv, "VIhdpm:u:s:i:e:n:r:ER")) != -1) switch(ch) { case 'V': fprintf(stderr, "ScanSSH %s\n", VERSION); @@ -1020,7 +1077,20 @@ main(int argc, char **argv) break; case 'p': scanner = "http-proxy,http-connect,socks5,socks4,telnet-proxy,ssh"; - default_ports = "23,22,80,1080,3128,6588,4480,8080,8081,8000,8100,9050"; + default_ports = "23,22,80,81,808,1080,1298,3128,6588,4480,8080,8081,8000,8100,9050"; + break; + case 'm': + max_scanqueue_size = atoi(optarg); + if (max_scanqueue_size == 0) { + usage(name); + exit(1); + } + break; + case 'u': + if (parse_socks_host(optarg) == -1) { + usage(name); + exit(1); + } break; case 's': scanner = optarg; @@ -1092,6 +1162,19 @@ main(int argc, char **argv) err(1, "setrlimit: NOFILE"); } + /* Raising the memory limits */ + rl.rlim_max = RLIM_INFINITY; + rl.rlim_cur = MAXSLOTS * EXPANDEDARGS * sizeof(struct argument) * 2; + if (setrlimit(RLIMIT_DATA, &rl) == -1) { + /* Linux does not seem to like this */ + if (getrlimit(RLIMIT_DATA, &rl) == -1) + err(1, "getrlimit: DATA"); + rl.rlim_cur = rl.rlim_max; + if (setrlimit(RLIMIT_DATA, &rl) == -1) + err(1, "setrlimit: DATA"); + } + + /* revoke privs */ #ifdef HAVE_SETEUID seteuid(getuid()); diff -pruN 2.0-4.1/scanssh.h 2.1-0ubuntu8/scanssh.h --- 2.0-4.1/scanssh.h 2004-04-06 07:28:37.000000000 +0000 +++ 2.1-0ubuntu8/scanssh.h 2004-11-21 08:08:34.000000000 +0000 @@ -47,6 +47,14 @@ #define FLAGS_USERANDOM 0x01 #define FLAGS_SUBTRACTEXCLUDE 0x02 +struct socks_host { + TAILQ_ENTRY(socks_host) next; + struct addr host; + uint16_t port; +}; + +TAILQ_HEAD(socksq, socks_host); + struct argument; struct address_slot { @@ -122,7 +130,7 @@ int ipv4toa(char *, size_t, void *); void waitforcommands(int, int); void argument_free(struct argument *); -void postres(struct argument *, char *); +void postres(struct argument *, const char *fmt, ...); void printres(struct argument *, uint16_t, char *); int probe_haswork(void); diff -pruN 2.0-4.1/socks.c 2.1-0ubuntu8/socks.c --- 2.0-4.1/socks.c 2004-04-06 07:30:01.000000000 +0000 +++ 2.1-0ubuntu8/socks.c 2004-11-05 06:39:05.000000000 +0000 @@ -333,7 +333,7 @@ socks5_readcb(struct bufferevent *bev, v return; error: - postres(arg, ""); + postres(arg, ""); done: scanhost_return(bev, arg, 0); } @@ -371,7 +371,7 @@ socks5_errorcb(struct bufferevent *bev, DFPRINTF((stderr, "%s: called\n", __func__)); - postres(arg, ""); + postres(arg, ""); scanhost_return(bev, arg, 0); } @@ -399,16 +399,16 @@ socks4_readcb(struct bufferevent *bev, v case SOCKS4_RESP_SUCCESS: break; case SOCKS4_RESP_FAILURE: - postres(arg, ""); + postres(arg, ""); goto done; case SOCKS4_RESP_NOIDENT: - postres(arg, ""); + postres(arg, ""); goto done; case SOCKS4_RESP_BADIDENT: - postres(arg, ""); + postres(arg, ""); goto done; default: - postres(arg, ""); + postres(arg, ""); goto done; } @@ -429,7 +429,7 @@ socks4_readcb(struct bufferevent *bev, v return; error: - postres(arg, ""); + postres(arg, ""); done: scanhost_return(bev, arg, 0); } @@ -478,6 +478,6 @@ socks4_errorcb(struct bufferevent *bev, DFPRINTF((stderr, "%s: called\n", __func__)); - postres(arg, ""); + postres(arg, ""); scanhost_return(bev, arg, 0); } diff -pruN 2.0-4.1/telnet.c 2.1-0ubuntu8/telnet.c --- 2.0-4.1/telnet.c 2004-04-06 07:29:18.000000000 +0000 +++ 2.1-0ubuntu8/telnet.c 2004-11-05 06:39:20.000000000 +0000 @@ -156,7 +156,7 @@ telnet_errorcb(struct bufferevent *bev, DFPRINTF((stderr, "%s: called\n", __func__)); - postres(arg, ""); + postres(arg, ""); scanhost_return(bev, arg, 0); } diff -pruN 2.0-4.1/TODO 2.1-0ubuntu8/TODO --- 2.0-4.1/TODO 1970-01-01 00:00:00.000000000 +0000 +++ 2.1-0ubuntu8/TODO 2004-12-18 19:57:40.000000000 +0000 @@ -0,0 +1,2 @@ +218.5.61.202:23 +CCProxy Telnet>CCProxy Telnet Service Ready. diff -pruN 2.0-4.1/xmalloc.c 2.1-0ubuntu8/xmalloc.c --- 2.0-4.1/xmalloc.c 2001-02-18 01:09:08.000000000 +0000 +++ 2.1-0ubuntu8/xmalloc.c 2004-07-14 04:10:30.000000000 +0000 @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -27,8 +28,12 @@ xmalloc(size_t size) if (size == 0) err(1,"xmalloc: zero size"); ptr = malloc(size); - if (ptr == NULL) - err(1,"xmalloc: out of memory (allocating %lu bytes)", (u_long) size); + if (ptr == NULL) { + fprintf(stderr, + "xmalloc: out of memory (allocating %lu bytes)", + (u_long) size); + abort(); + } return ptr; }