Attachment #79913 for bug #112194

View | Details | Raw Unified | Return to bug 112194
Collapse All | Expand All

Lines 7-13 Link Here

(-)zephyr.orig/Makefile.in (-1 / +1 lines)
7	sbindir=@sbindir@	7	sbindir=@sbindir@
8		8
9	includedir=${prefix}/include	9	includedir=${prefix}/include
10	mandir=${prefix}/man	10	mandir=@mandir@
11	bindir=${exec_prefix}/bin	11	bindir=${exec_prefix}/bin
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13		13

Lines 274-280 Link Here

(-)zephyr.orig/aclocal.m4 (-1 / +1 lines)
274	LDFLAGS="$LDFLAGS -L$hesiod/lib"	274	LDFLAGS="$LDFLAGS -L$hesiod/lib"
275	fi	275	fi
276	AC_CHECK_LIB(hesiod, hes_resolve, :,	276	AC_CHECK_LIB(hesiod, hes_resolve, :,
277	[AC_MSG_ERROR(Hesiod library not found)])])	277	[AC_MSG_ERROR(Hesiod library not found)],$LIBS)])
278		278
279	AC_DEFUN(ATHENA_HESIOD,	279	AC_DEFUN(ATHENA_HESIOD,
280	[AC_ARG_WITH(hesiod,	280	[AC_ARG_WITH(hesiod,

Lines 8-14 Link Here

(-)zephyr.orig/clients/xzwrite/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zaway/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zctl/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zleave/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zlocate/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zmailnotify/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/znol/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zpopnotify/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zshutdown_notify/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zstat/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 8-14 Link Here

(-)zephyr.orig/clients/zwrite/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14




#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

timestamp='2005-03-24'

# 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

# 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 <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>.  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 <config-patches@gnu.org>."

version="\
GNU config.guess ($timestamp)

Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
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

trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15

# 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 ;;
    amiga:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    cats:OpenBSD:*:*)
	echo arm-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    hp300:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    luna88k:OpenBSD:*:*)
    	echo m88k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    mac68k:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    macppc:OpenBSD:*:*)
	echo powerpc-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    mvme68k:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    mvme88k:OpenBSD:*:*)
	echo m88k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    mvmeppc:OpenBSD:*:*)
	echo powerpc-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    sgi:OpenBSD:*:*)
	echo mips64-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    sun3:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    *:OpenBSD:*:*)
	echo ${UNAME_MACHINE}-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\ *: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
	lda \$2,259
	.long 0x47e20c21 # amask $2,$1
	srl \$1,8,\$2
	sll \$2,2,\$2
	sll \$0,3,\$0
	addl \$1,\$0,\$0
	addl \$2,\$0,\$0
	ret \$31,(\$26),1
	.end main
EOF
	${CC-cc} dummy.s -o dummy 2>/dev/null
	if test "$?" = 0 ; then
		./dummy
		case "$?" in
			7)
				UNAME_MACHINE="alpha"
				;;
			15)
				UNAME_MACHINE="alphaev5"
				;;
			14)
				UNAME_MACHINE="alphaev56"
				;;
			10)
				UNAME_MACHINE="alphapca56"
				;;
			16)
				UNAME_MACHINE="alphaev6"
				;;
		esac
	fi
	rm -f dummy.s dummy
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
	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;;
    amiga:NetBSD:*:*)
      echo m68k-cbm-netbsd${UNAME_RELEASE}
      exit 0 ;;
    amiga:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	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 ;;
    *:z/VM:*:*)
	echo s390-ibm-zvmoe
	exit 0 ;;
    *:OS400:*:*)
        echo powerpc-ibm-os400
	exit 0 ;;
    sgi:OpenBSD:*:*)
	echo mips-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    wgrisc:OpenBSD:*:*)
	echo mipsel-unknown-openbsd${UNAME_RELEASE}
	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 arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
	exit 0 ;;
    SR2?01: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

		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* | DRS?6000:isis: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 ;;

	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)

    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 ;;
    sun3*:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    mac68k:NetBSD:*:*)
	echo m68k-apple-netbsd${UNAME_RELEASE}
	exit 0 ;;
    mac68k:OpenBSD:*:*)
	echo m68k-unknown-openbsd${UNAME_RELEASE}
	exit 0 ;;
    mvme68k:OpenBSD:*:*)
	echo m68k-unknown-openbsd${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 ;;
    macppc:NetBSD:*:*)
        echo powerpc-apple-netbsd${UNAME_RELEASE}
        exit 0 ;;
    RISC*:Mach:*:*)
	echo mips-dec-mach_bsd4.3
	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 <stdio.h>  /* 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);

	  exit (-1);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c \
	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
	  && exit 0
	rm -f dummy.c dummy
	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 ;;

    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
        else echo i586-dg-dgux${UNAME_RELEASE}
        fi
 	exit 0 ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
	echo m88k-dolphin-sysv3

    ????????: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 <sys/systemcfg.h>

		main()

			exit(0);
			}
EOF
		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
		rm -f dummy.c dummy
		echo rs6000-ibm-aix3.2.5
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
		echo rs6000-ibm-aix3.2.4

		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

	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 ;;

    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 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 <stdlib.h>
              #include <unistd.h>

              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;

              		} 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 <unistd.h>
	int
	main ()

	  exit (0);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
	rm -f dummy.c dummy
	echo unknown-hitachi-hiuxwe2
	exit 0 ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )

    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

    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
	echo c4-convex-bsd
        exit 0 ;;
    CRAY*X-MP:*:*:*)
	echo xmp-cray-unicos
        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 craynv-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}"
	echo m68k-hp-netbsd${UNAME_RELEASE}
	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:*:*)
	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
	exit 0 ;;
    *:NetBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
	exit 0 ;;
    *:OpenBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
	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 ;;
    amd64:CYGWIN*:*:*)
	echo x86_64-unknown-cygwin
	exit 0 ;;
    p*:CYGWIN*:*)
	echo powerpcle-unknown-cygwin
	exit 0 ;;

	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 ;;
    crisv32:Linux:*:*)
	echo crisv32-axis-linux-gnu
	exit 0 ;;
    frv:Linux:*:*)
    	echo frv-unknown-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 <features.h>
	#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
				;;
			10)
				UNAME_MACHINE="alphapca56"
				;;
			16)
				UNAME_MACHINE="alphaev6"
				;;
			esac	

			objdump --private-headers dummy | \
			  grep ld.so.1 > /dev/null
			if test "$?" = 0 ; then
				LIBC="libc1"
			fi
		fi	
		rm -f dummy.s dummy
		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
	elif test "${UNAME_MACHINE}" = "mips" ; then
	  cat >dummy.c <<EOF
main(argc, argv)
     int argc;
     char *argv[];
{
#ifdef __MIPSEB__
  printf ("%s-unknown-linux-gnu\n", argv[1]);
#endif
#ifdef __MIPSEL__
  printf ("%sel-unknown-linux-gnu\n", argv[1]);
#endif
  return 0;
}
EOF
	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
	  rm -f dummy.c dummy
	else
	  # Either a pre-BFD a.out linker (linux-gnuoldld)
	  # or one that does not give us useful --help.
	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
	  # If ld does not provide *any* "supported emulations:"
	  # that means it is gnuoldld.
	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0

	  case "${UNAME_MACHINE}" in
	  i?86)
	    VENDOR=pc;
	    ;;
	  *)
	    VENDOR=unknown;
	    ;;
	  esac
	  # Determine whether the default compiler is a.out or elf
	  cat >dummy.c <<EOF
#include <features.h>
main(argc, argv)
     int argc;
     char *argv[];
{
#ifdef __ELF__
# ifdef __GLIBC__
#  if __GLIBC__ >= 2
    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
#  else
    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
#  endif
# else
   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
# endif
#else
  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
#endif
  return 0;
}
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,

        # 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' </usr/options/cb.name`
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
	elif /bin/uname -X 2>/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 ;;
    i?86:UnixWare:*:*)
	if /bin/uname -X 2>/dev/null >/dev/null ; then
	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
	    && UNAME_MACHINE=i586
	fi
	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
	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

	# "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 | S7501*:*:4.0:3.0)
	OS_REL=''
	test -r /etc/.relid \
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`

    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 ;;
    i?86:LynxOS:2.*:*)
	echo i386-unknown-lynxos${UNAME_RELEASE}
	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 ;;

		echo ns32k-sni-sysv
	fi
	exit 0 ;;
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                      # says <Richard.M.Bartel@ccMail.Census.GOV>
        echo i586-unisys-sysv4
        exit 0 ;;
    *:UNIX_System_V:4*: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

    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:*:*)
	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
	case $UNAME_PROCESSOR in
	    *86) UNAME_PROCESSOR=i686 ;;
	    unknown) 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 ;;
    NSE-?:NONSTOP_KERNEL:*:*)
	echo nse-tandem-nsk${UNAME_RELEASE}
	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 ;;
    *:*VMS:*:*)
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	case "${UNAME_MACHINE}" in
	    A*) echo alpha-dec-vms && exit 0 ;;
	    I*) echo ia64-dec-vms && exit 0 ;;
	    V*) echo vax-dec-vms && exit 0 ;;
	esac ;;
    *:XENIX:*:SysV)
	echo i386-pc-xenix
	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 <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>

#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


#endif

#if defined (vax)
# if !defined (ultrix)
#  include <sys/param.h>
#  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)

}
EOF

$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
rm -f dummy.c dummy

# Apollos put the system type in the environment.


    esac
fi

cat >&2 <<EOF
$0: unable to guess system type

This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from

  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
and
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

If the version you run ($0) is already up to date, please
send the following data and any information you think might be
pertinent to <config-patches@gnu.org> 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:

Lines 1-6 Link Here

(-)zephyr.orig/config.sub (-103 / +714 lines)
1	#! /bin/sh	1	#! /bin/sh
2	# Configuration validation subroutine script, version 1.1.	2	# Configuration validation subroutine script.
3	# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.	3	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
		4	# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
		5
		6	timestamp='2005-02-10'
		7
4	# This file is (in principle) common to ALL GNU software.	8	# This file is (in principle) common to ALL GNU software.
5	# The presence of a machine in this file suggests that SOME GNU software	9	# The presence of a machine in this file suggests that SOME GNU software
6	# can handle that machine. It does not imply ALL GNU software can.	10	# can handle that machine. It does not imply ALL GNU software can.
Lines 25-30 Link Here
25	# configuration script generated by Autoconf, you may include it under	29	# configuration script generated by Autoconf, you may include it under
26	# the same distribution terms that you use for the rest of that program.	30	# the same distribution terms that you use for the rest of that program.
27		31
		32	# Please send patches to <config-patches@gnu.org>. Submit a context
		33	# diff and a properly formatted ChangeLog entry.
		34	#
28	# Configuration subroutine to validate and canonicalize a configuration type.	35	# Configuration subroutine to validate and canonicalize a configuration type.
29	# Supply the specified configuration type as an argument.	36	# Supply the specified configuration type as an argument.
30	# If it is invalid, we print an error message on stderr and exit with code 1.	37	# If it is invalid, we print an error message on stderr and exit with code 1.
Lines 45-74 Link Here
45	# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM	52	# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
46	# It is wrong to echo any other type of specification.	53	# It is wrong to echo any other type of specification.
47		54
48	if [ x$1 = x ]	55	me=`echo "$0" \| sed -e 's,.*/,,'`
49	then
50	echo Configuration name missing. 1>&2
51	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
52	echo "or $0 ALIAS" 1>&2
53	echo where ALIAS is a recognized configuration type. 1>&2
54	exit 1
55	fi
56		56
57	# First pass through any local machine types.	57	usage="\
58	case $1 in	58	Usage: $0 [OPTION] CPU-MFR-OPSYS
59	local)	59	$0 [OPTION] ALIAS
60	echo $1	60
61	exit 0	61	Canonicalize a configuration name.
62	;;	62
63	*)	63	Operation modes:
64	;;	64	-h, --help print this help, then exit
		65	-t, --time-stamp print date of last modification, then exit
		66	-v, --version print version number, then exit
		67
		68	Report bugs and patches to <config-patches@gnu.org>."
		69
		70	version="\
		71	GNU config.sub ($timestamp)
		72
		73	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
		74	Free Software Foundation, Inc.
		75
		76	This is free software; see the source for copying conditions. There is NO
		77	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
		78
		79	help="
		80	Try \`$me --help' for more information."
		81
		82	# Parse command line
		83	while test $# -gt 0 ; do
		84	case $1 in
		85	--time-stamp \| --time* \| -t )
		86	echo "$timestamp" ; exit 0 ;;
		87	--version \| -v )
		88	echo "$version" ; exit 0 ;;
		89	--help \| --h* \| -h )
		90	echo "$usage"; exit 0 ;;
		91	-- ) # Stop option processing
		92	shift; break ;;
		93	- ) # Use stdin as input.
		94	break ;;
		95	-* )
		96	echo "$me: invalid option $1$help"
		97	exit 1 ;;
		98
		99	local)
		100	# First pass through any local machine types.
		101	echo $1
		102	exit 0;;
		103
		104	* )
		105	break ;;
		106	esac
		107	done
		108
		109	case $# in
		110	0) echo "$me: missing argument$help" >&2
		111	exit 1;;
		112	1) ;;
		113	*) echo "$me: too many arguments$help" >&2
		114	exit 1;;
65	esac	115	esac
66		116
67	# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).	117	# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
68	# Here we must recognize all the valid KERNEL-OS combinations.	118	# Here we must recognize all the valid KERNEL-OS combinations.
69	maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`	119	maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`
70	case $maybe_os in	120	case $maybe_os in
71	linux-gnu*)	121	nto-qnx* \| linux-gnu* \| linux-dietlibc \| linux-uclibc* \| uclinux-uclibc* \| uclinux-gnu* \| \
		122	kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \| storm-chaos* \| os2-emx* \| rtmk-nova*)
72	os=-$maybe_os	123	os=-$maybe_os
73	basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`	124	basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
74	;;	125	;;
Lines 94-108 Link Here
94	-convergent* \| -ncr* \| -news \| -32* \| -3600* \| -3100* \| -hitachi* \|\	145	-convergent* \| -ncr* \| -news \| -32* \| -3600* \| -3100* \| -hitachi* \|\
95	-c[123]* \| -convex* \| -sun \| -crds \| -omron* \| -dg \| -ultra \| -tti* \| \	146	-c[123]* \| -convex* \| -sun \| -crds \| -omron* \| -dg \| -ultra \| -tti* \| \
96	-harris \| -dolphin \| -highlevel \| -gould \| -cbm \| -ns \| -masscomp \| \	147	-harris \| -dolphin \| -highlevel \| -gould \| -cbm \| -ns \| -masscomp \| \
97	-apple)	148	-apple \| -axis \| -knuth \| -cray)
		149	os=
		150	basic_machine=$1
		151	;;
		152	-sim \| -cisco \| -oki \| -wec \| -winbond)
98	os=	153	os=
99	basic_machine=$1	154	basic_machine=$1
100	;;	155	;;
		156	-scout)
		157	;;
		158	-wrs)
		159	os=-vxworks
		160	basic_machine=$1
		161	;;
		162	-chorusos*)
		163	os=-chorusos
		164	basic_machine=$1
		165	;;
		166	-chorusrdb)
		167	os=-chorusrdb
		168	basic_machine=$1
		169	;;
101	-hiux*)	170	-hiux*)
102	os=-hiuxwe2	171	os=-hiuxwe2
103	;;	172	;;
104	-sco5)	173	-sco5)
105	os=sco3.2v5	174	os=-sco3.2v5
106	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`	175	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
107	;;	176	;;
108	-sco4)	177	-sco4)
Lines 121-126 Link Here
121	os=-sco3.2v2	190	os=-sco3.2v2
122	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`	191	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
123	;;	192	;;
		193	-udk*)
		194	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
		195	;;
124	-isc)	196	-isc)
125	os=-isc2.2	197	os=-isc2.2
126	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`	198	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
Lines 143-168 Link Here
143	-psos*)	215	-psos*)
144	os=-psos	216	os=-psos
145	;;	217	;;
		218	-mint \| -mint[0-9]*)
		219	basic_machine=m68k-atari
		220	os=-mint
		221	;;
146	esac	222	esac
147		223
148	# Decode aliases for certain CPU-COMPANY combinations.	224	# Decode aliases for certain CPU-COMPANY combinations.
149	case $basic_machine in	225	case $basic_machine in
150	# Recognize the basic CPU types without company name.	226	# Recognize the basic CPU types without company name.
151	# Some are omitted here because they have special meanings below.	227	# Some are omitted here because they have special meanings below.
152	tahoe \| i860 \| m32r \| m68k \| m68000 \| m88k \| ns32k \| arc \| arm \	228	1750a \| 580 \
153	\| arme[lb] \| pyramid \| mn10200 \| mn10300 \| tron \| a29k \	229	\| a29k \
154	\| 580 \| i960 \| h8300 \| hppa \| hppa1.0 \| hppa1.1 \| hppa2.0 \	230	\| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \| alphapca5[67] \
155	\| alpha \| alphaev5 \| alphaev56 \| we32k \| ns16k \| clipper \	231	\| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[67] \
156	\| i370 \| sh \| powerpc \| powerpcle \| 1750a \| dsp16xx \| pdp11 \	232	\| am33_2.0 \
157	\| mips64 \| mipsel \| mips64el \| mips64orion \| mips64orionel \	233	\| arc \| arm \| arm[bl]e \| arme[lb] \| armv[2345] \| armv[345][lb] \| avr \
158	\| mipstx39 \| mipstx39el \	234	\| c4x \| clipper \
159	\| sparc \| sparclet \| sparclite \| sparc64 \| v850)	235	\| d10v \| d30v \| dlx \| dsp16xx \
		236	\| fr30 \| frv \
		237	\| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
		238	\| i370 \| i860 \| i960 \| ia64 \
		239	\| ip2k \| iq2000 \
		240	\| m32r \| m32rle \| m68000 \| m68k \| m88k \| maxq \| mcore \
		241	\| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
		242	\| mips16 \
		243	\| mips64 \| mips64el \
		244	\| mips64vr \| mips64vrel \
		245	\| mips64orion \| mips64orionel \
		246	\| mips64vr4100 \| mips64vr4100el \
		247	\| mips64vr4300 \| mips64vr4300el \
		248	\| mips64vr5000 \| mips64vr5000el \
		249	\| mipsisa32 \| mipsisa32el \
		250	\| mipsisa32r2 \| mipsisa32r2el \
		251	\| mipsisa64 \| mipsisa64el \
		252	\| mipsisa64r2 \| mipsisa64r2el \
		253	\| mipsisa64sb1 \| mipsisa64sb1el \
		254	\| mipsisa64sr71k \| mipsisa64sr71kel \
		255	\| mipstx39 \| mipstx39el \
		256	\| mn10200 \| mn10300 \
		257	\| msp430 \
		258	\| ns16k \| ns32k \
		259	\| openrisc \| or32 \
		260	\| pdp10 \| pdp11 \| pj \| pjl \
		261	\| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| ppcbe \
		262	\| pyramid \
		263	\| sh \| sh[1234] \| sh[23]e \| sh[34]eb \| shbe \| shle \| sh[1234]le \| sh3ele \
		264	\| sh64 \| sh64le \
		265	\| sparc \| sparc64 \| sparc86x \| sparclet \| sparclite \| sparcv8 \| sparcv9 \| sparcv9b \
		266	\| strongarm \
		267	\| tahoe \| thumb \| tic4x \| tic80 \| tron \
		268	\| v850 \| v850e \
		269	\| we32k \
		270	\| x86 \| xscale \| xscalee[bl] \| xstormy16 \| xtensa \
		271	\| z8k)
160	basic_machine=$basic_machine-unknown	272	basic_machine=$basic_machine-unknown
161	;;	273	;;
		274	m6811 \| m68hc11 \| m6812 \| m68hc12)
		275	# Motorola 68HC11/12.
		276	basic_machine=$basic_machine-unknown
		277	os=-none
		278	;;
		279	m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65 \| z8k)
		280	;;
		281
162	# We use `pc' rather than `unknown'	282	# We use `pc' rather than `unknown'
163	# because (1) that's what they normally are, and	283	# because (1) that's what they normally are, and
164	# (2) the word "unknown" tends to confuse beginning users.	284	# (2) the word "unknown" tends to confuse beginning users.
165	i[34567]86)	285	i*86 \| x86_64)
166	basic_machine=$basic_machine-pc	286	basic_machine=$basic_machine-pc
167	;;	287	;;
168	# Object if more than one company name word.	288	# Object if more than one company name word.
Lines 171-197 Link Here
171	exit 1	291	exit 1
172	;;	292	;;
173	# Recognize the basic CPU types with company name.	293	# Recognize the basic CPU types with company name.
174	vax-* \| tahoe-* \| i[34567]86-* \| i860-* \| m32r-* \| m68k-* \| m68000-* \	294	580-* \
175	\| m88k-* \| sparc-* \| ns32k-* \| fx80-* \| arc-* \| arm-* \| c[123]* \	295	\| a29k-* \
176	\| mips-* \| pyramid-* \| tron-* \| a29k-* \| romp-* \| rs6000-* \	296	\| alpha-* \| alphaev[4-8]-* \| alphaev56-* \| alphaev6[78]-* \
177	\| power-* \| none-* \| 580-* \| cray2-* \| h8300-* \| i960-* \	297	\| alpha64-* \| alpha64ev[4-8]-* \| alpha64ev56-* \| alpha64ev6[78]-* \
178	\| xmp-* \| ymp-* \| hppa-* \| hppa1.0-* \| hppa1.1-* \| hppa2.0-* \	298	\| alphapca5[67]-* \| alpha64pca5[67]-* \| arc-* \
179	\| alpha-* \| alphaev5-* \| alphaev56-* \| we32k-* \| cydra-* \	299	\| arm-* \| armbe-* \| armle-* \| armeb-* \| armv- \
180	\| ns16k-* \| pn-* \| np1-* \| xps100-* \| clipper-* \| orion-* \	300	\| avr-* \
181	\| sparclite-* \| pdp11-* \| sh-* \| powerpc-* \| powerpcle-* \	301	\| bs2000-* \
182	\| sparc64-* \| mips64-* \| mipsel-* \	302	\| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \| c54x-* \| c55x-* \| c6x-* \
183	\| mips64el-* \| mips64orion-* \| mips64orionel-* \	303	\| clipper-* \| craynv-* \| cydra-* \
184	\| mipstx39-* \| mipstx39el-* \	304	\| d10v-* \| d30v-* \| dlx-* \
185	\| f301-*)	305	\| elxsi-* \
		306	\| f30[01]-* \| f700-* \| fr30-* \| frv-* \| fx80-* \
		307	\| h8300-* \| h8500-* \
		308	\| hppa-* \| hppa1.[01]-* \| hppa2.0-* \| hppa2.0[nw]-* \| hppa64-* \
		309	\| i86- \| i860-* \| i960-* \| ia64-* \
		310	\| ip2k-* \| iq2000-* \
		311	\| m32r-* \| m32rle-* \
		312	\| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \
		313	\| m88110-* \| m88k-* \| maxq-* \| mcore-* \
		314	\| mips-* \| mipsbe-* \| mipseb-* \| mipsel-* \| mipsle-* \
		315	\| mips16-* \
		316	\| mips64-* \| mips64el-* \
		317	\| mips64vr-* \| mips64vrel-* \
		318	\| mips64orion-* \| mips64orionel-* \
		319	\| mips64vr4100-* \| mips64vr4100el-* \
		320	\| mips64vr4300-* \| mips64vr4300el-* \
		321	\| mips64vr5000-* \| mips64vr5000el-* \
		322	\| mipsisa32-* \| mipsisa32el-* \
		323	\| mipsisa32r2-* \| mipsisa32r2el-* \
		324	\| mipsisa64-* \| mipsisa64el-* \
		325	\| mipsisa64r2-* \| mipsisa64r2el-* \
		326	\| mipsisa64sb1-* \| mipsisa64sb1el-* \
		327	\| mipsisa64sr71k-* \| mipsisa64sr71kel-* \
		328	\| mipstx39-* \| mipstx39el-* \
		329	\| mmix-* \
		330	\| msp430-* \
		331	\| none-* \| np1-* \| ns16k-* \| ns32k-* \
		332	\| orion-* \
		333	\| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \
		334	\| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \| ppcbe-* \
		335	\| pyramid-* \
		336	\| romp-* \| rs6000-* \
		337	\| sh-* \| sh[1234]-* \| sh[23]e-* \| sh[34]eb-* \| shbe-* \
		338	\| shle-* \| sh[1234]le-* \| sh3ele-* \| sh64-* \| sh64le-* \
		339	\| sparc-* \| sparc64-* \| sparc86x-* \| sparclet-* \| sparclite-* \
		340	\| sparcv8-* \| sparcv9-* \| sparcv9b-* \| strongarm-* \| sv1-* \| sx?-* \
		341	\| tahoe-* \| thumb-* \
		342	\| tic30-* \| tic4x-* \| tic54x-* \| tic55x-* \| tic6x-* \| tic80-* \
		343	\| tron-* \
		344	\| v850-* \| v850e-* \| vax-* \
		345	\| we32k-* \
		346	\| x86-* \| x86_64-* \| xps100-* \| xscale-* \| xscalee[bl]-* \
		347	\| xstormy16-* \| xtensa-* \
		348	\| ymp-* \
		349	\| z8k-*)
186	;;	350	;;
187	# Recognize the various machine names and aliases which stand	351	# Recognize the various machine names and aliases which stand
188	# for a CPU type and a company and sometimes even an OS.	352	# for a CPU type and a company and sometimes even an OS.
		353	386bsd)
		354	basic_machine=i386-unknown
		355	os=-bsd
		356	;;
189	3b1 \| 7300 \| 7300-att \| att-7300 \| pc7300 \| safari \| unixpc)	357	3b1 \| 7300 \| 7300-att \| att-7300 \| pc7300 \| safari \| unixpc)
190	basic_machine=m68000-att	358	basic_machine=m68000-att
191	;;	359	;;
192	3b*)	360	3b*)
193	basic_machine=we32k-att	361	basic_machine=we32k-att
194	;;	362	;;
		363	a29khif)
		364	basic_machine=a29k-amd
		365	os=-udi
		366	;;
		367	abacus)
		368	basic_machine=abacus-unknown
		369	;;
		370	adobe68k)
		371	basic_machine=m68010-adobe
		372	os=-scout
		373	;;
195	alliant \| fx80)	374	alliant \| fx80)
196	basic_machine=fx80-alliant	375	basic_machine=fx80-alliant
197	;;	376	;;
Lines 202-226 Link Here
202	basic_machine=a29k-none	381	basic_machine=a29k-none
203	os=-bsd	382	os=-bsd
204	;;	383	;;
		384	amd64)
		385	basic_machine=x86_64-pc
		386	;;
		387	amd64-*)
		388	basic_machine=x86_64-`echo $basic_machine \| sed 's/^[^-]*-//'`
		389	;;
205	amdahl)	390	amdahl)
206	basic_machine=580-amdahl	391	basic_machine=580-amdahl
207	os=-sysv	392	os=-sysv
208	;;	393	;;
209	amiga \| amiga-*)	394	amiga \| amiga-*)
210	basic_machine=m68k-cbm	395	basic_machine=m68k-unknown
211	;;	396	;;
212	amigaos \| amigados)	397	amigaos \| amigados)
213	basic_machine=m68k-cbm	398	basic_machine=m68k-unknown
214	os=-amigaos	399	os=-amigaos
215	;;	400	;;
216	amigaunix \| amix)	401	amigaunix \| amix)
217	basic_machine=m68k-cbm	402	basic_machine=m68k-unknown
218	os=-sysv4	403	os=-sysv4
219	;;	404	;;
220	apollo68)	405	apollo68)
221	basic_machine=m68k-apollo	406	basic_machine=m68k-apollo
222	os=-sysv	407	os=-sysv
223	;;	408	;;
		409	apollo68bsd)
		410	basic_machine=m68k-apollo
		411	os=-bsd
		412	;;
224	aux)	413	aux)
225	basic_machine=m68k-apple	414	basic_machine=m68k-apple
226	os=-aux	415	os=-aux
Lines 229-234 Link Here
229	basic_machine=ns32k-sequent	418	basic_machine=ns32k-sequent
230	os=-dynix	419	os=-dynix
231	;;	420	;;
		421	c90)
		422	basic_machine=c90-cray
		423	os=-unicos
		424	;;
232	convex-c1)	425	convex-c1)
233	basic_machine=c1-convex	426	basic_machine=c1-convex
234	os=-bsd	427	os=-bsd
Lines 249-275 Link Here
249	basic_machine=c38-convex	442	basic_machine=c38-convex
250	os=-bsd	443	os=-bsd
251	;;	444	;;
252	cray \| ymp)	445	cray \| j90)
253	basic_machine=ymp-cray	446	basic_machine=j90-cray
254	os=-unicos	447	os=-unicos
255	;;	448	;;
256	cray2)	449	craynv)
257	basic_machine=cray2-cray	450	basic_machine=craynv-cray
258	os=-unicos	451	os=-unicosmp
259	;;	452	;;
260	[ctj]90-cray)	453	cr16c)
261	basic_machine=c90-cray	454	basic_machine=cr16c-unknown
262	os=-unicos	455	os=-elf
263	;;	456	;;
264	crds \| unos)	457	crds \| unos)
265	basic_machine=m68k-crds	458	basic_machine=m68k-crds
266	;;	459	;;
		460	crisv32 \| crisv32-* \| etraxfs*)
		461	basic_machine=crisv32-axis
		462	;;
		463	cris \| cris-* \| etrax*)
		464	basic_machine=cris-axis
		465	;;
		466	crx)
		467	basic_machine=crx-unknown
		468	os=-elf
		469	;;
267	da30 \| da30-*)	470	da30 \| da30-*)
268	basic_machine=m68k-da30	471	basic_machine=m68k-da30
269	;;	472	;;
270	decstation \| decstation-3100 \| pmax \| pmax-* \| pmin \| dec3100 \| decstatn)	473	decstation \| decstation-3100 \| pmax \| pmax-* \| pmin \| dec3100 \| decstatn)
271	basic_machine=mips-dec	474	basic_machine=mips-dec
272	;;	475	;;
		476	decsystem10* \| dec10*)
		477	basic_machine=pdp10-dec
		478	os=-tops10
		479	;;
		480	decsystem20* \| dec20*)
		481	basic_machine=pdp10-dec
		482	os=-tops20
		483	;;
273	delta \| 3300 \| motorola-3300 \| motorola-delta \	484	delta \| 3300 \| motorola-3300 \| motorola-delta \
274	\| 3300-motorola \| delta-motorola)	485	\| 3300-motorola \| delta-motorola)
275	basic_machine=m68k-motorola	486	basic_machine=m68k-motorola
Lines 278-283 Link Here
278	basic_machine=m88k-motorola	489	basic_machine=m88k-motorola
279	os=-sysv3	490	os=-sysv3
280	;;	491	;;
		492	djgpp)
		493	basic_machine=i586-pc
		494	os=-msdosdjgpp
		495	;;
281	dpx20 \| dpx20-*)	496	dpx20 \| dpx20-*)
282	basic_machine=rs6000-bull	497	basic_machine=rs6000-bull
283	os=-bosx	498	os=-bosx
Lines 297-302 Link Here
297	encore \| umax \| mmax)	512	encore \| umax \| mmax)
298	basic_machine=ns32k-encore	513	basic_machine=ns32k-encore
299	;;	514	;;
		515	es1800 \| OSE68k \| ose68k \| ose \| OSE)
		516	basic_machine=m68k-ericsson
		517	os=-ose
		518	;;
300	fx2800)	519	fx2800)
301	basic_machine=i860-alliant	520	basic_machine=i860-alliant
302	;;	521	;;
Lines 307-312 Link Here
307	basic_machine=tron-gmicro	526	basic_machine=tron-gmicro
308	os=-sysv	527	os=-sysv
309	;;	528	;;
		529	go32)
		530	basic_machine=i386-pc
		531	os=-go32
		532	;;
310	h3050r* \| hiux*)	533	h3050r* \| hiux*)
311	basic_machine=hppa1.1-hitachi	534	basic_machine=hppa1.1-hitachi
312	os=-hiuxwe2	535	os=-hiuxwe2
Lines 315-320 Link Here
315	basic_machine=h8300-hitachi	538	basic_machine=h8300-hitachi
316	os=-hms	539	os=-hms
317	;;	540	;;
		541	h8300xray)
		542	basic_machine=h8300-hitachi
		543	os=-xray
		544	;;
		545	h8500hms)
		546	basic_machine=h8500-hitachi
		547	os=-hms
		548	;;
318	harris)	549	harris)
319	basic_machine=m88k-harris	550	basic_machine=m88k-harris
320	os=-sysv3	551	os=-sysv3
Lines 330-342 Link Here
330	basic_machine=m68k-hp	561	basic_machine=m68k-hp
331	os=-hpux	562	os=-hpux
332	;;	563	;;
		564	hp3k9[0-9][0-9] \| hp9[0-9][0-9])
		565	basic_machine=hppa1.0-hp
		566	;;
333	hp9k2[0-9][0-9] \| hp9k31[0-9])	567	hp9k2[0-9][0-9] \| hp9k31[0-9])
334	basic_machine=m68000-hp	568	basic_machine=m68000-hp
335	;;	569	;;
336	hp9k3[2-9][0-9])	570	hp9k3[2-9][0-9])
337	basic_machine=m68k-hp	571	basic_machine=m68k-hp
338	;;	572	;;
339	hp9k7[0-9][0-9] \| hp7[0-9][0-9] \| hp9k8[0-9]7 \| hp8[0-9]7)	573	hp9k6[0-9][0-9] \| hp6[0-9][0-9])
		574	basic_machine=hppa1.0-hp
		575	;;
		576	hp9k7[0-79][0-9] \| hp7[0-79][0-9])
		577	basic_machine=hppa1.1-hp
		578	;;
		579	hp9k78[0-9] \| hp78[0-9])
		580	# FIXME: really hppa2.0-hp
		581	basic_machine=hppa1.1-hp
		582	;;
		583	hp9k8[67]1 \| hp8[67]1 \| hp9k80[24] \| hp80[24] \| hp9k8[78]9 \| hp8[78]9 \| hp9k893 \| hp893)
		584	# FIXME: really hppa2.0-hp
		585	basic_machine=hppa1.1-hp
		586	;;
		587	hp9k8[0-9][13679] \| hp8[0-9][13679])
340	basic_machine=hppa1.1-hp	588	basic_machine=hppa1.1-hp
341	;;	589	;;
342	hp9k8[0-9][0-9] \| hp8[0-9][0-9])	590	hp9k8[0-9][0-9] \| hp8[0-9][0-9])
Lines 345-371 Link Here
345	hppa-next)	593	hppa-next)
346	os=-nextstep3	594	os=-nextstep3
347	;;	595	;;
		596	hppaosf)
		597	basic_machine=hppa1.1-hp
		598	os=-osf
		599	;;
		600	hppro)
		601	basic_machine=hppa1.1-hp
		602	os=-proelf
		603	;;
348	i370-ibm* \| ibm*)	604	i370-ibm* \| ibm*)
349	basic_machine=i370-ibm	605	basic_machine=i370-ibm
350	os=-mvs
351	;;	606	;;
352	# I'm not sure what "Sysv32" means. Should this be sysv3.2?	607	# I'm not sure what "Sysv32" means. Should this be sysv3.2?
353	i[34567]86v32)	608	i*86v32)
354	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`	609	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
355	os=-sysv32	610	os=-sysv32
356	;;	611	;;
357	i[34567]86v4*)	612	i86v4)
358	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`	613	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
359	os=-sysv4	614	os=-sysv4
360	;;	615	;;
361	i[34567]86v)	616	i*86v)
362	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`	617	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
363	os=-sysv	618	os=-sysv
364	;;	619	;;
365	i[34567]86sol2)	620	i*86sol2)
366	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`	621	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
367	os=-solaris2	622	os=-solaris2
368	;;	623	;;
		624	i386mach)
		625	basic_machine=i386-mach
		626	os=-mach
		627	;;
		628	i386-vsta \| vsta)
		629	basic_machine=i386-unknown
		630	os=-vsta
		631	;;
369	iris \| iris4d)	632	iris \| iris4d)
370	basic_machine=mips-sgi	633	basic_machine=mips-sgi
371	case $os in	634	case $os in
Lines 391-406 Link Here
391	basic_machine=ns32k-utek	654	basic_machine=ns32k-utek
392	os=-sysv	655	os=-sysv
393	;;	656	;;
		657	mingw32)
		658	basic_machine=i386-pc
		659	os=-mingw32
		660	;;
394	miniframe)	661	miniframe)
395	basic_machine=m68000-convergent	662	basic_machine=m68000-convergent
396	;;	663	;;
397	mipsel-linux)	664	mint \| -mint[0-9] \| MiNT \| MiNT[0-9]*)
398	basic_machine=mipsel-unknown	665	basic_machine=m68k-atari
399	os=-linux-gnu	666	os=-mint
400	;;
401	mips-linux)
402	basic_machine=mips-unknown
403	os=-linux-gnu
404	;;	667	;;
405	mips3-)	668	mips3-)
406	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`	669	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`
Lines 408-417 Link Here
408	mips3*)	671	mips3*)
409	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`-unknown	672	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`-unknown
410	;;	673	;;
		674	monitor)
		675	basic_machine=m68k-rom68k
		676	os=-coff
		677	;;
		678	morphos)
		679	basic_machine=powerpc-unknown
		680	os=-morphos
		681	;;
		682	msdos)
		683	basic_machine=i386-pc
		684	os=-msdos
		685	;;
		686	mvs)
		687	basic_machine=i370-ibm
		688	os=-mvs
		689	;;
411	ncr3000)	690	ncr3000)
412	basic_machine=i486-ncr	691	basic_machine=i486-ncr
413	os=-sysv4	692	os=-sysv4
414	;;	693	;;
		694	netbsd386)
		695	basic_machine=i386-unknown
		696	os=-netbsd
		697	;;
		698	netwinder)
		699	basic_machine=armv4l-rebel
		700	os=-linux
		701	;;
415	news \| news700 \| news800 \| news900)	702	news \| news700 \| news800 \| news900)
416	basic_machine=m68k-sony	703	basic_machine=m68k-sony
417	os=-newsos	704	os=-newsos
Lines 424-429 Link Here
424	basic_machine=mips-sony	711	basic_machine=mips-sony
425	os=-newsos	712	os=-newsos
426	;;	713	;;
		714	necv70)
		715	basic_machine=v70-nec
		716	os=-sysv
		717	;;
427	next \| m*-next )	718	next \| m*-next )
428	basic_machine=m68k-next	719	basic_machine=m68k-next
429	case $os in	720	case $os in
Lines 449-457 Link Here
449	basic_machine=i960-intel	740	basic_machine=i960-intel
450	os=-nindy	741	os=-nindy
451	;;	742	;;
		743	mon960)
		744	basic_machine=i960-intel
		745	os=-mon960
		746	;;
		747	nonstopux)
		748	basic_machine=mips-compaq
		749	os=-nonstopux
		750	;;
452	np1)	751	np1)
453	basic_machine=np1-gould	752	basic_machine=np1-gould
454	;;	753	;;
		754	nsr-tandem)
		755	basic_machine=nsr-tandem
		756	;;
		757	op50n-* \| op60c-*)
		758	basic_machine=hppa1.1-oki
		759	os=-proelf
		760	;;
		761	or32 \| or32-*)
		762	basic_machine=or32-unknown
		763	os=-coff
		764	;;
		765	os400)
		766	basic_machine=powerpc-ibm
		767	os=-os400
		768	;;
		769	OSE68000 \| ose68000)
		770	basic_machine=m68000-ericsson
		771	os=-ose
		772	;;
		773	os68k)
		774	basic_machine=m68k-none
		775	os=-os68k
		776	;;
455	pa-hitachi)	777	pa-hitachi)
456	basic_machine=hppa1.1-hitachi	778	basic_machine=hppa1.1-hitachi
457	os=-hiuxwe2	779	os=-hiuxwe2
Lines 466-516 Link Here
466	pbb)	788	pbb)
467	basic_machine=m68k-tti	789	basic_machine=m68k-tti
468	;;	790	;;
469	pc532 \| pc532-*)	791	pc532 \| pc532-*)
470	basic_machine=ns32k-pc532	792	basic_machine=ns32k-pc532
471	;;	793	;;
472	pentium \| p5 \| k5 \| nexen)	794	pentium \| p5 \| k5 \| k6 \| nexgen \| viac3)
473	basic_machine=i586-pc	795	basic_machine=i586-pc
474	;;	796	;;
475	pentiumpro \| p6 \| k6 \| 6x86)	797	pentiumpro \| p6 \| 6x86 \| athlon \| athlon_*)
476	basic_machine=i686-pc	798	basic_machine=i686-pc
477	;;	799	;;
478	pentiumii \| pentium2)	800	pentiumii \| pentium2 \| pentiumiii \| pentium3)
		801	basic_machine=i686-pc
		802	;;
		803	pentium4)
479	basic_machine=i786-pc	804	basic_machine=i786-pc
480	;;	805	;;
481	pentium-* \| p5-* \| k5-* \| nexen-*)	806	pentium-* \| p5-* \| k5-* \| k6-* \| nexgen-* \| viac3-*)
482	basic_machine=i586-`echo $basic_machine \| sed 's/^[^-]*-//'`	807	basic_machine=i586-`echo $basic_machine \| sed 's/^[^-]*-//'`
483	;;	808	;;
484	pentiumpro-* \| p6-* \| k6-* \| 6x86-*)	809	pentiumpro-* \| p6-* \| 6x86-* \| athlon-*)
		810	basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
		811	;;
		812	pentiumii-* \| pentium2-* \| pentiumiii-* \| pentium3-*)
485	basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`	813	basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
486	;;	814	;;
487	pentiumii-* \| pentium2-*)	815	pentium4-*)
488	basic_machine=i786-`echo $basic_machine \| sed 's/^[^-]*-//'`	816	basic_machine=i786-`echo $basic_machine \| sed 's/^[^-]*-//'`
489	;;	817	;;
490	pn)	818	pn)
491	basic_machine=pn-gould	819	basic_machine=pn-gould
492	;;	820	;;
493	power) basic_machine=rs6000-ibm	821	power) basic_machine=power-ibm
494	;;	822	;;
495	ppc) basic_machine=powerpc-unknown	823	ppc) basic_machine=powerpc-unknown
496	;;	824	;;
497	ppc-) basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'`	825	ppc-) basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'`
498	;;	826	;;
499	ppcle \| powerpclittle \| ppc-le \| powerpc-little)	827	ppcle \| powerpclittle \| ppc-le \| powerpc-little)
500	basic_machine=powerpcle-unknown	828	basic_machine=powerpcle-unknown
501	;;	829	;;
502	ppcle-* \| powerpclittle-*)	830	ppcle-* \| powerpclittle-*)
503	basic_machine=powerpcle-`echo $basic_machine \| sed 's/^[^-]*-//'`	831	basic_machine=powerpcle-`echo $basic_machine \| sed 's/^[^-]*-//'`
504	;;	832	;;
		833	ppc64) basic_machine=powerpc64-unknown
		834	;;
		835	ppc64-) basic_machine=powerpc64-`echo $basic_machine \| sed 's/^[^-]-//'`
		836	;;
		837	ppc64le \| powerpc64little \| ppc64-le \| powerpc64-little)
		838	basic_machine=powerpc64le-unknown
		839	;;
		840	ppc64le-* \| powerpc64little-*)
		841	basic_machine=powerpc64le-`echo $basic_machine \| sed 's/^[^-]*-//'`
		842	;;
505	ps2)	843	ps2)
506	basic_machine=i386-ibm	844	basic_machine=i386-ibm
507	;;	845	;;
		846	pw32)
		847	basic_machine=i586-unknown
		848	os=-pw32
		849	;;
		850	rom68k)
		851	basic_machine=m68k-rom68k
		852	os=-coff
		853	;;
508	rm[46]00)	854	rm[46]00)
509	basic_machine=mips-siemens	855	basic_machine=mips-siemens
510	;;	856	;;
511	rtpc \| rtpc-*)	857	rtpc \| rtpc-*)
512	basic_machine=romp-ibm	858	basic_machine=romp-ibm
513	;;	859	;;
		860	s390 \| s390-*)
		861	basic_machine=s390-ibm
		862	;;
		863	s390x \| s390x-*)
		864	basic_machine=s390x-ibm
		865	;;
		866	sa29200)
		867	basic_machine=a29k-amd
		868	os=-udi
		869	;;
		870	sb1)
		871	basic_machine=mipsisa64sb1-unknown
		872	;;
		873	sb1el)
		874	basic_machine=mipsisa64sb1el-unknown
		875	;;
		876	sei)
		877	basic_machine=mips-sei
		878	os=-seiux
		879	;;
514	sequent)	880	sequent)
515	basic_machine=i386-sequent	881	basic_machine=i386-sequent
516	;;	882	;;
Lines 518-523 Link Here
518	basic_machine=sh-hitachi	884	basic_machine=sh-hitachi
519	os=-hms	885	os=-hms
520	;;	886	;;
		887	sh64)
		888	basic_machine=sh64-unknown
		889	;;
		890	sparclite-wrs \| simso-wrs)
		891	basic_machine=sparclite-wrs
		892	os=-vxworks
		893	;;
521	sps7)	894	sps7)
522	basic_machine=m68k-bull	895	basic_machine=m68k-bull
523	os=-sysv2	896	os=-sysv2
Lines 525-530 Link Here
525	spur)	898	spur)
526	basic_machine=spur-unknown	899	basic_machine=spur-unknown
527	;;	900	;;
		901	st2000)
		902	basic_machine=m68k-tandem
		903	;;
		904	stratus)
		905	basic_machine=i860-stratus
		906	os=-sysv4
		907	;;
528	sun2)	908	sun2)
529	basic_machine=m68000-sun	909	basic_machine=m68000-sun
530	;;	910	;;
Lines 565-583 Link Here
565	sun386 \| sun386i \| roadrunner)	945	sun386 \| sun386i \| roadrunner)
566	basic_machine=i386-sun	946	basic_machine=i386-sun
567	;;	947	;;
		948	sv1)
		949	basic_machine=sv1-cray
		950	os=-unicos
		951	;;
568	symmetry)	952	symmetry)
569	basic_machine=i386-sequent	953	basic_machine=i386-sequent
570	os=-dynix	954	os=-dynix
571	;;	955	;;
		956	t3e)
		957	basic_machine=alphaev5-cray
		958	os=-unicos
		959	;;
		960	t90)
		961	basic_machine=t90-cray
		962	os=-unicos
		963	;;
		964	tic54x \| c54x*)
		965	basic_machine=tic54x-unknown
		966	os=-coff
		967	;;
		968	tic55x \| c55x*)
		969	basic_machine=tic55x-unknown
		970	os=-coff
		971	;;
		972	tic6x \| c6x*)
		973	basic_machine=tic6x-unknown
		974	os=-coff
		975	;;
572	tx39)	976	tx39)
573	basic_machine=mipstx39-unknown	977	basic_machine=mipstx39-unknown
574	;;	978	;;
575	tx39el)	979	tx39el)
576	basic_machine=mipstx39el-unknown	980	basic_machine=mipstx39el-unknown
577	;;	981	;;
		982	toad1)
		983	basic_machine=pdp10-xkl
		984	os=-tops20
		985	;;
578	tower \| tower-32)	986	tower \| tower-32)
579	basic_machine=m68k-ncr	987	basic_machine=m68k-ncr
580	;;	988	;;
		989	tpf)
		990	basic_machine=s390x-ibm
		991	os=-tpf
		992	;;
581	udi29k)	993	udi29k)
582	basic_machine=a29k-amd	994	basic_machine=a29k-amd
583	os=-udi	995	os=-udi
Lines 586-591 Link Here
586	basic_machine=a29k-nyu	998	basic_machine=a29k-nyu
587	os=-sym1	999	os=-sym1
588	;;	1000	;;
		1001	v810 \| necv810)
		1002	basic_machine=v810-nec
		1003	os=-none
		1004	;;
589	vaxv)	1005	vaxv)
590	basic_machine=vax-dec	1006	basic_machine=vax-dec
591	os=-sysv	1007	os=-sysv
Lines 595-602 Link Here
595	os=-vms	1011	os=-vms
596	;;	1012	;;
597	vpp\|vx\|vx-)	1013	vpp\|vx\|vx-)
598	basic_machine=f301-fujitsu	1014	basic_machine=f301-fujitsu
599	;;	1015	;;
600	vxworks960)	1016	vxworks960)
601	basic_machine=i960-wrs	1017	basic_machine=i960-wrs
602	os=-vxworks	1018	os=-vxworks
Lines 609-621 Link Here
609	basic_machine=a29k-wrs	1025	basic_machine=a29k-wrs
610	os=-vxworks	1026	os=-vxworks
611	;;	1027	;;
612	xmp)	1028	w65*)
613	basic_machine=xmp-cray	1029	basic_machine=w65-wdc
614	os=-unicos	1030	os=-none
		1031	;;
		1032	w89k-*)
		1033	basic_machine=hppa1.1-winbond
		1034	os=-proelf
615	;;	1035	;;
616	xps \| xps100)	1036	xbox)
		1037	basic_machine=i686-pc
		1038	os=-mingw32
		1039	;;
		1040	xps \| xps100)
617	basic_machine=xps100-honeywell	1041	basic_machine=xps100-honeywell
618	;;	1042	;;
		1043	ymp)
		1044	basic_machine=ymp-cray
		1045	os=-unicos
		1046	;;
		1047	z8k-*-coff)
		1048	basic_machine=z8k-unknown
		1049	os=-sim
		1050	;;
619	none)	1051	none)
620	basic_machine=none-none	1052	basic_machine=none-none
621	os=-none	1053	os=-none
Lines 623-654 Link Here
623		1055
624	# Here we handle the default manufacturer of certain CPU types. It is in	1056	# Here we handle the default manufacturer of certain CPU types. It is in
625	# some cases the only manufacturer, in others, it is the most popular.	1057	# some cases the only manufacturer, in others, it is the most popular.
626	mips)	1058	w89k)
627	if [ x$os = x-linux-gnu ]; then	1059	basic_machine=hppa1.1-winbond
628	basic_machine=mips-unknown	1060	;;
629	else	1061	op50n)
630	basic_machine=mips-mips	1062	basic_machine=hppa1.1-oki
631	fi	1063	;;
		1064	op60c)
		1065	basic_machine=hppa1.1-oki
632	;;	1066	;;
633	romp)	1067	romp)
634	basic_machine=romp-ibm	1068	basic_machine=romp-ibm
635	;;	1069	;;
		1070	mmix)
		1071	basic_machine=mmix-knuth
		1072	;;
636	rs6000)	1073	rs6000)
637	basic_machine=rs6000-ibm	1074	basic_machine=rs6000-ibm
638	;;	1075	;;
639	vax)	1076	vax)
640	basic_machine=vax-dec	1077	basic_machine=vax-dec
641	;;	1078	;;
		1079	pdp10)
		1080	# there are many clones, so DEC is not a safe bet
		1081	basic_machine=pdp10-unknown
		1082	;;
642	pdp11)	1083	pdp11)
643	basic_machine=pdp11-dec	1084	basic_machine=pdp11-dec
644	;;	1085	;;
645	we32k)	1086	we32k)
646	basic_machine=we32k-att	1087	basic_machine=we32k-att
647	;;	1088	;;
648	sparc)	1089	sh3 \| sh4 \| sh[34]eb \| sh[1234]le \| sh[23]ele)
		1090	basic_machine=sh-unknown
		1091	;;
		1092	sh64)
		1093	basic_machine=sh64-unknown
		1094	;;
		1095	sparc \| sparcv8 \| sparcv9 \| sparcv9b)
649	basic_machine=sparc-sun	1096	basic_machine=sparc-sun
650	;;	1097	;;
651	cydra)	1098	cydra)
652	basic_machine=cydra-cydrome	1099	basic_machine=cydra-cydrome
653	;;	1100	;;
654	orion)	1101	orion)
Lines 657-662 Link Here
657	orion105)	1104	orion105)
658	basic_machine=clipper-highlevel	1105	basic_machine=clipper-highlevel
659	;;	1106	;;
		1107	mac \| mpw \| mac-mpw)
		1108	basic_machine=m68k-apple
		1109	;;
		1110	pmac \| pmac-mpw)
		1111	basic_machine=powerpc-apple
		1112	;;
		1113	*-unknown)
		1114	# Make sure to match an already-canonicalized machine name.
		1115	;;
660	*)	1116	*)
661	echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2	1117	echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
662	exit 1	1118	exit 1
Lines 709-722 Link Here
709	\| -aos* \	1165	\| -aos* \
710	\| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \	1166	\| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \
711	\| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \	1167	\| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \
712	\| -hiux* \| -386bsd* \| -netbsd* \| -openbsd* \| -freebsd* \| -riscix* \	1168	\| -hiux* \| -386bsd* \| -knetbsd* \| -mirbsd* \| -netbsd* \| -openbsd* \
713	\| -lynxos* \| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \	1169	\| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
		1170	\| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
714	\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \	1171	\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
715	\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \	1172	\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
		1173	\| -chorusos* \| -chorusrdb* \
716	\| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \	1174	\| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
717	\| -mingw32* \| -linux-gnu* \| -uxpv* \| -beos*)	1175	\| -mingw32* \| -linux-gnu* \| -linux-uclibc* \| -uxpv* \| -beos* \| -mpeix* \| -udk* \
		1176	\| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \
		1177	\| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \
		1178	\| -storm-chaos* \| -tops10* \| -tenex* \| -tops20* \| -its* \
		1179	\| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
		1180	\| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \
		1181	\| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly*)
718	# Remember, each alternative MUST END IN *, to match a version number.	1182	# Remember, each alternative MUST END IN *, to match a version number.
719	;;	1183	;;
		1184	-qnx*)
		1185	case $basic_machine in
		1186	x86-* \| i86-)
		1187	;;
		1188	*)
		1189	os=-nto$os
		1190	;;
		1191	esac
		1192	;;
		1193	-nto-qnx*)
		1194	;;
		1195	-nto*)
		1196	os=`echo $os \| sed -e 's\|nto\|nto-qnx\|'`
		1197	;;
		1198	-sim \| -es1800* \| -hms* \| -xray \| -os68k* \| -none* \| -v88r* \
		1199	\| -windows* \| -osx \| -abug \| -netware* \| -os9* \| -beos* \
		1200	\| -macos* \| -mpw* \| -magic* \| -mmixware* \| -mon960* \| -lnews*)
		1201	;;
		1202	-mac*)
		1203	os=`echo $os \| sed -e 's\|mac\|macos\|'`
		1204	;;
		1205	-linux-dietlibc)
		1206	os=-linux-dietlibc
		1207	;;
720	-linux*)	1208	-linux*)
721	os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`	1209	os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`
722	;;	1210	;;
Lines 726-731 Link Here
726	-sunos6*)	1214	-sunos6*)
727	os=`echo $os \| sed -e 's\|sunos6\|solaris3\|'`	1215	os=`echo $os \| sed -e 's\|sunos6\|solaris3\|'`
728	;;	1216	;;
		1217	-opened*)
		1218	os=-openedition
		1219	;;
		1220	-os400*)
		1221	os=-os400
		1222	;;
		1223	-wince*)
		1224	os=-wince
		1225	;;
729	-osfrose*)	1226	-osfrose*)
730	os=-osfrose	1227	os=-osfrose
731	;;	1228	;;
Lines 741-751 Link Here
741	-acis*)	1238	-acis*)
742	os=-aos	1239	os=-aos
743	;;	1240	;;
		1241	-atheos*)
		1242	os=-atheos
		1243	;;
		1244	-syllable*)
		1245	os=-syllable
		1246	;;
		1247	-386bsd)
		1248	os=-bsd
		1249	;;
744	-ctix* \| -uts*)	1250	-ctix* \| -uts*)
745	os=-sysv	1251	os=-sysv
746	;;	1252	;;
		1253	-nova*)
		1254	os=-rtmk-nova
		1255	;;
747	-ns2 )	1256	-ns2 )
748	os=-nextstep2	1257	os=-nextstep2
		1258	;;
		1259	-nsk*)
		1260	os=-nsk
749	;;	1261	;;
750	# Preserve the version number of sinix5.	1262	# Preserve the version number of sinix5.
751	-sinix5.*)	1263	-sinix5.*)
Lines 754-759 Link Here
754	-sinix*)	1266	-sinix*)
755	os=-sysv4	1267	os=-sysv4
756	;;	1268	;;
		1269	-tpf*)
		1270	os=-tpf
		1271	;;
757	-triton*)	1272	-triton*)
758	os=-sysv3	1273	os=-sysv3
759	;;	1274	;;
Lines 772-780 Link Here
772	# This must come after -sysvr4.	1287	# This must come after -sysvr4.
773	-sysv*)	1288	-sysv*)
774	;;	1289	;;
		1290	-ose*)
		1291	os=-ose
		1292	;;
		1293	-es1800*)
		1294	os=-ose
		1295	;;
775	-xenix)	1296	-xenix)
776	os=-xenix	1297	os=-xenix
777	;;	1298	;;
		1299	-mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
		1300	os=-mint
		1301	;;
		1302	-aros*)
		1303	os=-aros
		1304	;;
		1305	-kaos*)
		1306	os=-kaos
		1307	;;
		1308	-zvmoe)
		1309	os=-zvmoe
		1310	;;
778	-none)	1311	-none)
779	;;	1312	;;
780	*)	1313	*)
Lines 800-809 Link Here
800	*-acorn)	1333	*-acorn)
801	os=-riscix1.2	1334	os=-riscix1.2
802	;;	1335	;;
		1336	arm*-rebel)
		1337	os=-linux
		1338	;;
803	arm*-semi)	1339	arm*-semi)
804	os=-aout	1340	os=-aout
805	;;	1341	;;
806	pdp11-*)	1342	c4x-* \| tic4x-*)
		1343	os=-coff
		1344	;;
		1345	# This must come before the *-dec entry.
		1346	pdp10-*)
		1347	os=-tops20
		1348	;;
		1349	pdp11-*)
807	os=-none	1350	os=-none
808	;;	1351	;;
809	-dec \| vax-)	1352	-dec \| vax-)
Lines 821-826 Link Here
821	# default.	1364	# default.
822	# os=-sunos4	1365	# os=-sunos4
823	;;	1366	;;
		1367	m68*-cisco)
		1368	os=-aout
		1369	;;
		1370	mips*-cisco)
		1371	os=-elf
		1372	;;
		1373	mips-)
		1374	os=-elf
		1375	;;
		1376	or32-*)
		1377	os=-coff
		1378	;;
824	*-tti) # must be before sparc entry or we get the wrong os.	1379	*-tti) # must be before sparc entry or we get the wrong os.
825	os=-sysv3	1380	os=-sysv3
826	;;	1381	;;
Lines 833-838 Link Here
833	*-ibm)	1388	*-ibm)
834	os=-aix	1389	os=-aix
835	;;	1390	;;
		1391	*-knuth)
		1392	os=-mmixware
		1393	;;
		1394	*-wec)
		1395	os=-proelf
		1396	;;
		1397	*-winbond)
		1398	os=-proelf
		1399	;;
		1400	*-oki)
		1401	os=-proelf
		1402	;;
836	*-hp)	1403	*-hp)
837	os=-hpux	1404	os=-hpux
838	;;	1405	;;
Lines 875-901 Link Here
875	*-next)	1442	*-next)
876	os=-nextstep3	1443	os=-nextstep3
877	;;	1444	;;
878	*-gould)	1445	*-gould)
879	os=-sysv	1446	os=-sysv
880	;;	1447	;;
881	*-highlevel)	1448	*-highlevel)
882	os=-bsd	1449	os=-bsd
883	;;	1450	;;
884	*-encore)	1451	*-encore)
885	os=-bsd	1452	os=-bsd
886	;;	1453	;;
887	*-sgi)	1454	*-sgi)
888	os=-irix	1455	os=-irix
889	;;	1456	;;
890	*-siemens)	1457	*-siemens)
891	os=-sysv4	1458	os=-sysv4
892	;;	1459	;;
893	*-masscomp)	1460	*-masscomp)
894	os=-rtu	1461	os=-rtu
895	;;	1462	;;
896	f301-fujitsu)	1463	f30[01]-fujitsu \| f700-fujitsu)
897	os=-uxpv	1464	os=-uxpv
898	;;	1465	;;
		1466	*-rom68k)
		1467	os=-coff
		1468	;;
		1469	-bug)
		1470	os=-coff
		1471	;;
		1472	*-apple)
		1473	os=-macos
		1474	;;
		1475	-atari)
		1476	os=-mint
		1477	;;
899	*)	1478	*)
900	os=-none	1479	os=-none
901	;;	1480	;;
Lines 917-925 Link Here
917	-aix*)	1496	-aix*)
918	vendor=ibm	1497	vendor=ibm
919	;;	1498	;;
		1499	-beos*)
		1500	vendor=be
		1501	;;
920	-hpux*)	1502	-hpux*)
921	vendor=hp	1503	vendor=hp
922	;;	1504	;;
		1505	-mpeix*)
		1506	vendor=hp
		1507	;;
923	-hiux*)	1508	-hiux*)
924	vendor=hitachi	1509	vendor=hitachi
925	;;	1510	;;
Lines 935-955 Link Here
935	-genix*)	1520	-genix*)
936	vendor=ns	1521	vendor=ns
937	;;	1522	;;
938	-mvs*)	1523	-mvs* \| -opened*)
		1524	vendor=ibm
		1525	;;
		1526	-os400*)
939	vendor=ibm	1527	vendor=ibm
940	;;	1528	;;
941	-ptx*)	1529	-ptx*)
942	vendor=sequent	1530	vendor=sequent
943	;;	1531	;;
944	-vxsim* \| -vxworks*)	1532	-tpf*)
		1533	vendor=ibm
		1534	;;
		1535	-vxsim* \| -vxworks* \| -windiss*)
945	vendor=wrs	1536	vendor=wrs
946	;;	1537	;;
947	-aux*)	1538	-aux*)
948	vendor=apple	1539	vendor=apple
949	;;	1540	;;
		1541	-hms*)
		1542	vendor=hitachi
		1543	;;
		1544	-mpw* \| -macos*)
		1545	vendor=apple
		1546	;;
		1547	-mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
		1548	vendor=atari
		1549	;;
		1550	-vos*)
		1551	vendor=stratus
		1552	;;
950	esac	1553	esac
951	basic_machine=`echo $basic_machine \| sed "s/unknown/$vendor/"`	1554	basic_machine=`echo $basic_machine \| sed "s/unknown/$vendor/"`
952	;;	1555	;;
953	esac	1556	esac
954		1557
955	echo $basic_machine$os	1558	echo $basic_machine$os
		1559	exit 0
		1560
		1561	# Local variables:
		1562	# eval: (add-hook 'write-file-hooks 'time-stamp)
		1563	# time-stamp-start: "timestamp='"
		1564	# time-stamp-format: "%:y-%02m-%02d"
		1565	# time-stamp-end: "'"
		1566	# End:




#line 2378 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
main()
{
  FILE *f=fopen("conftestval", "w");

  exit(0);
}
EOF
if { (eval echo configure:2390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
  ac_cv_sizeof_short=`cat conftestval`
else



echo $ac_n "checking size of int""... $ac_c" 1>&6
echo "configure:2410: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else

    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
#line 2418 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
main()
{
  FILE *f=fopen("conftestval", "w");

  exit(0);
}
EOF
if { (eval echo configure:2430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
  ac_cv_sizeof_int=`cat conftestval`
else



echo $ac_n "checking size of long""... $ac_c" 1>&6
echo "configure:2450: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else

    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
#line 2458 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
main()
{
  FILE *f=fopen("conftestval", "w");

  exit(0);
}
EOF
if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
  ac_cv_sizeof_long=`cat conftestval`
else



echo $ac_n "checking for 32-bit integer type""... $ac_c" 1>&6
echo "configure:2490: checking for 32-bit integer type" >&5
if test "$ac_cv_sizeof_long" = 4; then
	int32=long
elif test "$ac_cv_sizeof_int" = 4; then

echo "$ac_t""${int32}" 1>&6

echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6
echo "configure:2508: checking for wslen in -lw" >&5
ac_lib_var=`echo w'_'wslen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lw  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2516 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

wslen()
; return 0; }
EOF
if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

fi

echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:2555: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-ldl  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2563 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

dlopen()
; return 0; }
EOF
if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else



echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6
echo "configure:2604: checking for library containing gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  ac_func_search_save_LIBS="$LIBS"
ac_cv_search_gethostbyname="no"
cat > conftest.$ac_ext <<EOF
#line 2611 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

gethostbyname()
; return 0; }
EOF
if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_gethostbyname="none required"
else

test "$ac_cv_search_gethostbyname" = "no" && for i in nsl; do
LIBS="-l$i  $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
#line 2633 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

gethostbyname()
; return 0; }
EOF
if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_gethostbyname="-l$i"
break

fi

echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
echo "configure:2666: checking for library containing socket" >&5
if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  ac_func_search_save_LIBS="$LIBS"
ac_cv_search_socket="no"
cat > conftest.$ac_ext <<EOF
#line 2673 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

socket()
; return 0; }
EOF
if { (eval echo configure:2684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_socket="none required"
else

test "$ac_cv_search_socket" = "no" && for i in socket; do
LIBS="-l$i  $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
#line 2695 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

socket()
; return 0; }
EOF
if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_socket="-l$i"
break

# Hesiod needs -lresolv on Sun systems for res_send.
if test "$hesiod" != "no"; then
	echo $ac_n "checking for strerror in -l44bsd""... $ac_c" 1>&6
echo "configure:2730: checking for strerror in -l44bsd" >&5
ac_lib_var=`echo 44bsd'_'strerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-l44bsd  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2738 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

strerror()
; return 0; }
EOF
if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

fi

	echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
echo "configure:2777: checking for res_send in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lresolv  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2785 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

res_send()
; return 0; }
EOF
if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"

fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  echo "$ac_t""yes" 1>&6
    ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
  cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF

  LIBS="-lresolv $LIBS"

else
  echo "$ac_t""no" 1>&6
fi

	echo $ac_n "checking for __res_send in -lresolv""... $ac_c" 1>&6
echo "configure:2824: checking for __res_send in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  ac_save_LIBS="$LIBS"
LIBS="-lresolv  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2832 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
char __res_send();

int main() {
__res_send()
; return 0; }
EOF
if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

fi

echo $ac_n "checking for tgetstr in -lcurses""... $ac_c" 1>&6
echo "configure:2873: checking for tgetstr in -lcurses" >&5
ac_lib_var=`echo curses'_'tgetstr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lcurses  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2881 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

tgetstr()
; return 0; }
EOF
if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

fi

echo $ac_n "checking for srcsrpy in -lsrc""... $ac_c" 1>&6
echo "configure:2914: checking for srcsrpy in -lsrc" >&5
ac_lib_var=`echo src'_'srcsrpy | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lsrc  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2922 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

srcsrpy()
; return 0; }
EOF
if { (eval echo configure:2933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else


if test "$krb4" != no; then
	echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
echo "configure:2970: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 2975 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char gethostbyname(); below.  */


; return 0; }
EOF
if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_gethostbyname=yes"
else

else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
echo "configure:3016: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lnsl  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3024 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

gethostbyname()
; return 0; }
EOF
if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

fi

echo $ac_n "checking for socket""... $ac_c" 1>&6
echo "configure:3065: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 3070 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char socket(); below.  */


; return 0; }
EOF
if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_socket=yes"
else

else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
echo "configure:3111: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lsocket  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3119 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

socket()
; return 0; }
EOF
if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

fi

echo $ac_n "checking for compile in -lgen""... $ac_c" 1>&6
echo "configure:3160: checking for compile in -lgen" >&5
ac_lib_var=`echo gen'_'compile | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lgen  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3168 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

compile()
; return 0; }
EOF
if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

	LDFLAGS="$LDFLAGS -L$krb4/lib"
fi
echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6
echo "configure:3214: checking for krb_rd_req in -lkrb4" >&5
ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3222 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

krb_rd_req()
; return 0; }
EOF
if { (eval echo configure:3233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6
echo "configure:3252: checking for krb_rd_req in -lkrb" >&5
ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lkrb -ldes $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3260 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

krb_rd_req()
; return 0; }
EOF
if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else


if test "$hesiod" != no; then
	echo $ac_n "checking for res_send""... $ac_c" 1>&6
echo "configure:3310: checking for res_send" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 3315 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char res_send(); below.  */


; return 0; }
EOF
if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_res_send=yes"
else

else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
echo "configure:3356: checking for res_send in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lresolv  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3364 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

res_send()
; return 0; }
EOF
if { (eval echo configure:3375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

	LDFLAGS="$LDFLAGS -L$hesiod/lib"
fi
echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6
echo "configure:3409: checking for hes_resolve in -lhesiod" >&5
ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  ac_save_LIBS="$LIBS"
LIBS="-lhesiod $LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3417 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

hes_resolve()
; return 0; }
EOF
if { (eval echo configure:3428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

		LDFLAGS="$LDFLAGS -L$regex/lib"
	fi
	echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
echo "configure:3470: checking for regcomp in -lregex" >&5
ac_lib_var=`echo regex'_'regcomp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lregex  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3478 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

regcomp()
; return 0; }
EOF
if { (eval echo configure:3489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else


else
	echo $ac_n "checking for regcomp""... $ac_c" 1>&6
echo "configure:3512: checking for regcomp" >&5
if eval "test \"`echo '$''{'ac_cv_func_regcomp'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 3517 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char regcomp(); below.  */


; return 0; }
EOF
if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_regcomp=yes"
else


if test "$ares" != no; then
	echo $ac_n "checking for res_send""... $ac_c" 1>&6
echo "configure:3572: checking for res_send" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 3577 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char res_send(); below.  */


; return 0; }
EOF
if { (eval echo configure:3600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_res_send=yes"
else

else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
echo "configure:3618: checking for res_send in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lresolv  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3626 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

res_send()
; return 0; }
EOF
if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

	LDFLAGS="$LDFLAGS -L$ares/lib"
fi
echo $ac_n "checking for ares_init in -lares""... $ac_c" 1>&6
echo "configure:3671: checking for ares_init in -lares" >&5
ac_lib_var=`echo ares'_'ares_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lares  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3679 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

ares_init()
; return 0; }
EOF
if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

		LDFLAGS="$LDFLAGS -L$com_err/lib"
	fi
	echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6
echo "configure:3732: checking for com_err in -lcom_err" >&5
ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lcom_err  $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3740 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

com_err()
; return 0; }
EOF
if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else

		LDFLAGS="$LDFLAGS -L$ss/lib"
	fi
	echo $ac_n "checking for ss_perror in -lss""... $ac_c" 1>&6
echo "configure:3789: checking for ss_perror in -lss" >&5
ac_lib_var=`echo ss'_'ss_perror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6

  ac_save_LIBS="$LIBS"
LIBS="-lss -lcom_err $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3797 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2

ss_perror()
; return 0; }
EOF
if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else


if test $ac_cv_prog_gcc = yes; then
    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
echo "configure:3836: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
    ac_pattern="Autoconf.*'x'"
  cat > conftest.$ac_ext <<EOF
#line 3842 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP


  if test $ac_cv_prog_gcc_traditional = no; then
    cat > conftest.$ac_ext <<EOF
#line 3860 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA

fi

echo $ac_n "checking for vprintf""... $ac_c" 1>&6
echo "configure:3882: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 3887 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char vprintf(); below.  */


; return 0; }
EOF
if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_vprintf=yes"
else


if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
echo "configure:3934: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 3939 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char _doprnt(); below.  */


; return 0; }
EOF
if { (eval echo configure:3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func__doprnt=yes"
else

fi

echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
echo "configure:3987: checking whether getpgrp takes no argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else

  { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
#line 3995 "configure"
#include "confdefs.h"

/*

}

EOF
if { (eval echo configure:4050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_getpgrp_void=yes
else

fi

echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
echo "configure:4074: checking whether setpgrp takes no argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else

  { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
#line 4082 "configure"
#include "confdefs.h"

#ifdef HAVE_UNISTD_H

}

EOF
if { (eval echo configure:4102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_setpgrp_void=no
else

for ac_func in putenv strchr memcpy memmove waitpid getlogin strerror random
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:4128: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 4133 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */


; return 0; }
EOF
if { (eval echo configure:4156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else

for ac_func in lrand48 gethostid getsid getpgid krb_get_err_text krb_log
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:4183: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
#line 4188 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */


; return 0; }
EOF
if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else

Lines 75-80 Link Here

(-)zephyr.orig/configure.in (+1 lines)
75	if test "$hesiod" != "no"; then	75	if test "$hesiod" != "no"; then
76	AC_CHECK_LIB(44bsd, strerror)	76	AC_CHECK_LIB(44bsd, strerror)
77	AC_CHECK_LIB(resolv, res_send)	77	AC_CHECK_LIB(resolv, res_send)
		78	AC_CHECK_LIB(resolv, __res_send)
78	fi	79	fi
79		80
80	AC_CHECK_LIB(curses, tgetstr, [TLIB=-lcurses], [TLIB=-ltermcap])	81	AC_CHECK_LIB(curses, tgetstr, [TLIB=-lcurses], [TLIB=-ltermcap])

Lines 97-101 Link Here

(-)zephyr.orig/h/internal.h (+1 lines)
97	int (pred) __P((ZNotice_t , void )), void arg,	97	int (pred) __P((ZNotice_t , void )), void arg,
98	int timeout));	98	int timeout));
99		99
		100	void Z_gettimeofday(struct _ZTimeval ztv, struct timezone tz);
100	#endif /* __INTERNAL_H__ */	101	#endif /* __INTERNAL_H__ */
101		102




} ZNotice_Kind_t;
extern ZCONST char *ZNoticeKinds[9];

struct _ZTimeval {
	int tv_sec;
	int tv_usec;
};

/* Unique ID format */
typedef struct _ZUnique_Id_t {
    struct	in_addr zuid_addr;
    struct	_ZTimeval	tv;
} ZUnique_Id_t;

/* Checksum */
typedef unsigned int ZChecksum_t;

/* Notice definition */
typedef struct _ZNotice_t {

    ZNotice_Kind_t	z_kind;
    ZUnique_Id_t	z_uid;
#define z_sender_addr	z_uid.zuid_addr
    struct		_ZTimeval z_time;
    unsigned short	z_port;
    int			z_auth;
    int			z_checked_auth;




/*
 * zephyr_err.h:
 * This file is automatically generated; please do not edit it.
 */

#define ZERR_PKTLEN                              (-772103680L)
#define ZERR_HEADERLEN                           (-772103679L)
#define ZERR_ILLVAL                              (-772103678L)
#define ZERR_HMPORT                              (-772103677L)
#define ZERR_PORTINUSE                           (-772103676L)
#define ZERR_BADPKT                              (-772103675L)
#define ZERR_VERS                                (-772103674L)
#define ZERR_NOPORT                              (-772103673L)
#define ZERR_NONOTICE                            (-772103672L)
#define ZERR_QLEN                                (-772103671L)
#define ZERR_HMDEAD                              (-772103670L)
#define ZERR_INTERNAL                            (-772103669L)
#define ZERR_NOLOCATIONS                         (-772103668L)
#define ZERR_NOMORELOCS                          (-772103667L)
#define ZERR_FIELDLEN                            (-772103666L)
#define ZERR_BADFIELD                            (-772103665L)
#define ZERR_SERVNAK                             (-772103664L)
#define ZERR_AUTHFAIL                            (-772103663L)
#define ZERR_LOGINFAIL                           (-772103662L)
#define ZERR_NOSUBSCRIPTIONS                     (-772103661L)
#define ZERR_NOMORESUBSCRIPTIONS                 (-772103660L)
#define ZERR_TOOMANYSUBS                         (-772103659L)
#define ZERR_EOF                                 (-772103658L)
extern void initialize_zeph_error_table(void);
#define ERROR_TABLE_BASE_zeph (-772103680L)

/* for compatibility with older versions... */
#define init_zeph_err_tbl initialize_zeph_error_table
#define zeph_err_base ERROR_TABLE_BASE_zeph




lsbindir=@lsbindir@

includedir=${prefix}/include
mandir=@mandir@
libdir=${exec_prefix}/lib
LIBS=@LIBS@

srcdir=@srcdir@
top_srcdir=@top_srcdir@

CC=@CC@
INSTALL=@INSTALL@
RANLIB=@RANLIB@
FPIC=
DEBUG=-O
CPPFLAGS=@CPPFLAGS@
CFLAGS=@CFLAGS@ ${DEBUG} ${FPIC}
ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \
	-I${BUILDTOP}/h ${CPPFLAGS}


	ZSendPkt.o ZSendRaw.o ZSendRLst.o ZSetDest.o ZSetFD.o ZSetSrv.o \
	ZSubs.o ZVariables.o ZWait4Not.o Zinternal.o

LIBEXT=a
all: libzephyr.$(LIBEXT)

libzephyr.a: ${OBJS}
	ar cru $@ ${OBJS}
	${RANLIB} $@

libzephyr.so: $(OBJS)
	gcc  -shared -Wl,-soname -Wl,libzephyr.so.$(SONAME) -o libzephyr.so $(OBJS) $(LIBS)  -lcom_err  

zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et
	compile_et ${srcdir}/zephyr_err.et
	mv zephyr_err.h ${BUILDTOP}/h/zephyr


check:

install: libzephyr.$(LIBEXT)
	-${INSTALL} -m 644 libzephyr.a ${DESTDIR}${libdir}
	-$(INSTALL) -m 644 libzephyr.so ${DESTDIR}$(libdir)

	${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1

clean:




{
    struct sockaddr_in bindin;
    int len;
#ifdef SO_BSDCOMPAT
    int on = 1;
#endif
    
    (void) ZClosePort();


	return (errno);
    }

#ifdef SO_BSDCOMPAT
    /* Prevent Linux from giving us socket errors we don't care about. */
    setsockopt(__Zephyr_fd, SOL_SOCKET, SO_BSDCOMPAT, &on, sizeof(on));
#endif

    bindin.sin_family = AF_INET;

    if (port && *port)

Lines 36-42 Link Here

(-)zephyr.orig/lib/ZVariables.c (-1 / +1 lines)
36	if ((ret = get_varval(varfile, var)) != ZERR_NONE)	36	if ((ret = get_varval(varfile, var)) != ZERR_NONE)
37	return (ret);	37	return (ret);
38		38
39	sprintf(varfile, "%s/zephyr.vars", SYSCONFDIR);	39	sprintf(varfile, "%s/zephyr/zephyr.vars", SYSCONFDIR);
40	return (get_varval(varfile, var));	40	return (get_varval(varfile, var));
41	}	41	}
42		42

Lines 575-580 Link Here

(-)zephyr.orig/lib/Zinternal.c (-3 / +11 lines)
575	return (ZERR_NONE);	575	return (ZERR_NONE);
576	}	576	}
577		577
		578	void Z_gettimeofday(struct _ZTimeval ztv, struct timezone tz)
		579	{
		580	struct timeval tv;
		581	(void) gettimeofday(&tv, tz); /* yeah, yeah, I know */
		582	ztv->tv_sec=tv.tv_sec;
		583	ztv->tv_usec=tv.tv_usec;
		584	}
		585
578	Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine)	586	Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine)
579	ZNotice_t *notice;	587	ZNotice_t *notice;
580	char *buffer;	588	char *buffer;
Lines 604-610 Link Here
604		612
605	notice->z_multinotice = "";	613	notice->z_multinotice = "";
606		614
607	(void) gettimeofday(&notice->z_uid.tv, (struct timezone *)0);	615	(void) Z_gettimeofday(&notice->z_uid.tv, (struct timezone *)0);
608	notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec);	616	notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec);
609	notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec);	617	notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec);
610		618
Lines 873-880 Link Here
873	(void) sprintf(multi, "%d/%d", offset, notice->z_message_len);	881	(void) sprintf(multi, "%d/%d", offset, notice->z_message_len);
874	partnotice.z_multinotice = multi;	882	partnotice.z_multinotice = multi;
875	if (offset > 0) {	883	if (offset > 0) {
876	(void) gettimeofday(&partnotice.z_uid.tv,	884	(void) Z_gettimeofday(&partnotice.z_uid.tv,
877	(struct timezone *)0);	885	(struct timezone *)0);
878	partnotice.z_uid.tv.tv_sec =	886	partnotice.z_uid.tv.tv_sec =
879	htonl((u_long) partnotice.z_uid.tv.tv_sec);	887	htonl((u_long) partnotice.z_uid.tv.tv_sec);
880	partnotice.z_uid.tv.tv_usec =	888	partnotice.z_uid.tv.tv_usec =

Lines 8-14 Link Here

(-)zephyr.orig/libdyn/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13		13
14	srcdir=@srcdir@	14	srcdir=@srcdir@

Lines 8-14 Link Here

(-)zephyr.orig/server/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13		13
14	srcdir=@srcdir@	14	srcdir=@srcdir@





#define		KRB_PROT_VERSION 	4

#define     swap_u_long(x) {\
 unsigned KRB4_32   _krb_swap_tmp[4];\
 swab((char *)  &x,    ((char *)  _krb_swap_tmp) +2 ,2); \
 swab(((char *) &x) +2,((char *)  _krb_swap_tmp),2); \
 x = _krb_swap_tmp[0];   \
                           }

/* Message types , always leave lsb for byte order */

#define		AUTH_MSG_KDC_REQUEST			 1<<1

int
krb_rd_req(authent,service,instance,from_addr,ad,fn)
    KTEXT authent;			/* The received message */
    char  *service;			/* Service name */
    char  *instance;			/* Service instance */
    unsigned KRB4_32 from_addr;	/* Net address of originating host */
    AUTH_DAT  *ad;			/* Structure to be filled in */
    char  *fn;				/* Filename to get keys from */
{
    KTEXT_ST ticket;     /* Temp storage for ticket */
    KTEXT tkt = &ticket;




char *programname;			/* set to the basename of argv[0] */
char myname[MAXHOSTNAMELEN];		/* my host name */

#ifndef HAVE_HESIOD
char list_file[128];
#endif
#ifdef HAVE_KRB4
char srvtab_file[128];
char my_realm[REALM_SZ];

    extern char *optarg;
    extern int optind;

#ifndef HAVE_HESIOD
    sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE);
#endif
#ifdef HAVE_KRB4
    sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB);
    sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE);




	zdbug((LOG_DEBUG, "rlm_deathgram: suggesting %s to %s", 
	       (server) ? server->addr_str : "nothing", realm->name));

#ifdef HAVE_KRB4
	if (!ticket_lookup(realm->name))
	    if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
		syslog(LOG_WARNING, "rlm_deathgram failed: %s", 
		       error_message(retval));
		return;
	    }
#endif

	if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) 
	    != ZERR_NONE) 

	    snotice.z_message = NULL;
	    snotice.z_message_len = 0;

#ifdef HAVE_KRB4
	    if (!ticket_lookup(realm->name))
		if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
		    syslog(LOG_WARNING, "rlm_wakeup failed: %s", 
			   error_message(retval));
		    continue;
		}
#endif

	    if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) 
		!= ZERR_NONE) 

	    (void) sprintf(multi, "%d/%d", offset+origoffset, origlen);
	    partnotice.z_multinotice = multi;
	    if (offset > 0) {
		(void) Z_gettimeofday(&partnotice.z_uid.tv, 
				      (struct timezone *)0);
		partnotice.z_uid.tv.tv_sec = htonl((u_long) 
						   partnotice.z_uid.tv.tv_sec);
		partnotice.z_uid.tv.tv_usec = 




#endif

static struct in_addr *get_server_addrs __P((int *number));
#ifndef HAVE_HESIOD
static char **get_server_list __P((char *file));
static void free_server_list __P((char **list));
#endif

static Unacked *srv_nacktab[SRV_NACKTAB_HASHSIZE];
Server *otherservers;		/* points to an array of the known

    int *number; /* RETURN */
{
    int i;
    char **server_hosts = NULL;
    char **server_hosts_free = NULL;
    char **cpp;
    struct in_addr *addrs;
    struct in_addr *addr;
    struct hostent *hp;

    server_hosts = get_server_list(list_file);
    server_hosts_free = server_hosts;
#ifdef HAVE_HESIOD
    /* get the names from Hesiod */
    server_hosts = hes_resolve("zephyr","sloc");
    if (!server_hosts)
      server_hosts = hes_resolve("zephyr","sloc");
#endif
    server_hosts = get_server_list(list_file);
    if (!server_hosts)
	return NULL;
#endif
    /* count up */
    i = 0;
    for (cpp = server_hosts; *cpp; cpp++)

	}
    }
    *number = i;
    if (server_hosts_free)
      free_server_list(server_hosts_free);
#endif
    return addrs;
}

#ifndef HAVE_HESIOD

static int nhosts = 0;

/*

    free(orig_list);
    return;
}
#endif

/*
 * initialize the server structure for address addr, and set a timer




Sched *check_key_sched_cache __P((des_cblock key));
void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
int krb_set_key __P((char *key, int cvt));
/* int krb_rd_req __P((KTEXT authent, char *service, char *instance,
		    unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); */
int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
int krb_get_lrealm __P((char *r, int n));
#endif

extern int nfds;			/* number to look at in select() */
extern int zdebug;
extern char myname[];			/* domain name of this host */
#ifndef HAVE_HESIOD
extern char list_file[];
#endif
#ifdef HAVE_KRB4
extern char srvtab_file[];
extern char my_realm[];

Lines 16-24 Link Here

(-)zephyr.orig/server/zsrv_conf.h (-2 lines)
16		16
17	/* Path names are relative to CONFDIR, except for the class registry. */	17	/* Path names are relative to CONFDIR, except for the class registry. */
18		18
19	#ifndef HAVE_HESIOD
20	#define SERVER_LIST_FILE "server.list"	19	#define SERVER_LIST_FILE "server.list"
21	#endif
22	#define REALM_LIST_FILE "realm.list"	20	#define REALM_LIST_FILE "realm.list"
23	#ifdef HAVE_KRB4	21	#ifdef HAVE_KRB4
24	#define ZEPHYR_SRVTAB "srvtab"	22	#define ZEPHYR_SRVTAB "srvtab"

Lines 8-14 Link Here

(-)zephyr.orig/zhm/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13		13
14	srcdir=@srcdir@	14	srcdir=@srcdir@

Lines 22-28 Link Here

(-)zephyr.orig/zhm/zhm.c (-1 / +1 lines)
22	#define srandom srand48	22	#define srandom srand48
23	#endif	23	#endif
24		24
25	#define PIDDIR "/var/athena/"	25	#define PIDDIR "/var/run/"
26		26
27	int hmdebug, rebootflag, noflushflag, errflg, dieflag, inetd, oldpid, nofork;	27	int hmdebug, rebootflag, noflushflag, errflg, dieflag, inetd, oldpid, nofork;
28	int no_server = 1, nservchang, nserv, nclt;	28	int no_server = 1, nservchang, nserv, nclt;

Lines 8-14 Link Here

(-)zephyr.orig/zwgc/Makefile.in (-1 / +1 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
13	bindir=${exec_prefix}/bin	13	bindir=${exec_prefix}/bin
14		14

Lines 230-236 Link Here

(-)zephyr.orig/zwgc/parser.y (-1 / +1 lines)
230	reverse_list_of_nodes($3));	230	reverse_list_of_nodes($3));
231	$$->next = $1;	231	$$->next = $1;
232	$$ = reverse_list_of_nodes($$); }	232	$$ = reverse_list_of_nodes($$); }
233		233	;
234	/* elseifparts needs to be reversed before using... */	234	/* elseifparts needs to be reversed before using... */
235	elseifparts : /* empty */	235	elseifparts : /* empty */
236	{ $$ = 0; }	236	{ $$ = 0; }





extern int tgetent();
extern char *tgetstr(),*getenv();
#if 0
short ospeed;
char PC;
#endif

/* Dictionary naming convention:


    int ex;
    string_dictionary_binding *b;
    int isrealtty = string_Eq(drivername, "tty");
#if 0
#ifdef HAVE_TERMIOS_H
    struct termios tbuf;



    ospeed = (ioctl(0, TIOCGETP, &sgttyb) == 0) ? sgttyb.sg_ospeed : 2400;
#endif
#endif

    if (termcap_dict == (string_dictionary) NULL)
      termcap_dict = string_dictionary_Create(7);

	/* We cheat here, and ignore the padding (if any) specified for
	   the mode-change strings (it's a real pain to do "right") */

#if 0
	tmp = tgetstr("pc", &p);
	PC = (tmp) ? *tmp : 0;
#endif
	if (tmp = tgetstr("md",&p)) {	/* bold ? */
	    EXPAND("B.bold");
	    tmp = tgetstr("me",&p);


	/* Add new block (call it temp) to result: */
	temp = (tty_str_info *)malloc(sizeof(struct _tty_str_info));
	*temp = current_mode;
	if (last_result_block) {
	    last_result_block->next = temp;
	    last_result_block = temp;

	}
	if (desc->code == DT_STR) {
	    /* just combine string info with current mode: */
	    *temp = current_mode;
	    temp->str = desc->str;
	    temp->len = desc->len;
	} else if (desc->code == DT_NL) {
	    /* make the new block a ' ' alignment block with an empty string */
	    temp->alignment = ' ';
	    temp->len = 0;
	    temp->ignore = 0;
	}
    }





.TP
.B break
Exits the innermost if, case, or while block.
.\" .if n .ll +2in
.TP
\fBcase \fIexpr1\fR [ ((\fBmatch \fIexpr\fR [,\fIexpr ...\fR]) | \fBdefault\fR)\fI commands \fR] ... \fBendcase\fR
Evaluates \fIexpr1\fR.  Then, each of the match expressions is

Completes processing of the current notice.  The remainder of the
description file is ignored after execution of this command.
.\" hack because the following line otherwise breaks because it is too long.
.\" .if n .ll +2in
.TP
\fBif \fIexpr1 \fBthen \fIcommands1\fR [\fBelseif \fIexpr2 \fBthen \fIcommands2\fR] ... [\fBelse \fIcommandsn\fR] \fBendif\fR
If \fIexpr1\fR evaluates to true, execute \fIcommands1\fI, etc. [A conditional

.\" .TQ 15
.\" @em
.\" Emphasis.  Use underline if available, else reverse video.
.TP
@roman
Roman (plain) letters (turns off all special modes).
.TP
@b or @bold
Bold letters.  If not available, reverse video, else underline.
.TP
@i or @italic
Italic letters (underlining, if available).
.TP
@beep
"bl" termcap entry, else "^G" (beep the terminal); limited to once per
message.

.\" .TQ
.\" @u
.\" "us"/"ue" termcap entry.
.TP
@l or @left
left aligned
.TP
@c or @center
center aligned
.TP
@r or @right
right aligned
.RE

formatted according to @ commands embedded in the string.  Supported
@ commands are:
.RS 10
.TP 15
@roman
turns off @italic and @bold
.TP
@b or @bold
turns on boldface
.TP
@i or @italic
turns on italics
.TP
@l or @left
left aligned
.TP
@c or @center
center aligned
.TP
@r or @right
right aligned
.TP
@large
large type size
.TP
@medium
medium type size
.TP
@small
small type size
.TP
@beep
Ring the X bell (limited to once per message)
.TP

.IP
Zwgc variables which the X output device reads are:
.RS 10
.TP 15
default_X_geometry
default geometry for notices, set from resources
.TP
X_geometry
overrides geometry in resource file, if set
.TP
default_X_background
default background color for notices, set from resources
.TP
X_background
overrides bgcolor in resource file, if set
.TP
style
style, as described above
.RE

which case you must get new tickets and then run ``zctl load
/dev/null''.)
.SH FILES
.TP 15
$HOME/.zwgc.desc
Default location of user's description file
.TP
/usr/athena/share/zephyr/zwgc.desc
System-wide description file
.TP
/usr/athena/share/zephyr/zwgc_resources
Default X application resources.
.TP
$HOME/.zephyr.vars
File containing variable definitions
.TP
$HOME/.zephyr.subs
Supplementary subscription file
.TP
$HOME/.Xresources
Standard X resources file
.TP
$WGFILE or /tmp/wg.\fIuid\fR
File used to store WindowGram port number for other clients
.SH SEE ALSO

Return to bug 112194

Lines 62-75 Link Here

(-)zephyr.orig/h/zephyr/zephyr.h (-3 / +8 lines)
62	} ZNotice_Kind_t;	62	} ZNotice_Kind_t;
63	extern ZCONST char *ZNoticeKinds[9];	63	extern ZCONST char *ZNoticeKinds[9];
64		64
		65	struct _ZTimeval {
		66	int tv_sec;
		67	int tv_usec;
		68	};
		69
65	/* Unique ID format */	70	/* Unique ID format */
66	typedef struct _ZUnique_Id_t {	71	typedef struct _ZUnique_Id_t {
67	struct in_addr zuid_addr;	72	struct in_addr zuid_addr;
68	struct timeval tv;	73	struct _ZTimeval tv;
69	} ZUnique_Id_t;	74	} ZUnique_Id_t;
70		75
71	/* Checksum */	76	/* Checksum */
72	typedef unsigned long ZChecksum_t;	77	typedef unsigned int ZChecksum_t;
73		78
74	/* Notice definition */	79	/* Notice definition */
75	typedef struct _ZNotice_t {	80	typedef struct _ZNotice_t {
Lines 78-84 Link Here
78	ZNotice_Kind_t z_kind;	83	ZNotice_Kind_t z_kind;
79	ZUnique_Id_t z_uid;	84	ZUnique_Id_t z_uid;
80	#define z_sender_addr z_uid.zuid_addr	85	#define z_sender_addr z_uid.zuid_addr
81	struct timeval z_time;	86	struct _ZTimeval z_time;
82	unsigned short z_port;	87	unsigned short z_port;
83	int z_auth;	88	int z_auth;
84	int z_checked_auth;	89	int z_checked_auth;

Line 0 Link Here

(-)zephyr.orig/h/zephyr/zephyr_err.h (+34 lines)
	1	/*
	2	* zephyr_err.h:
	3	* This file is automatically generated; please do not edit it.
	4	*/
	5
	6	#define ZERR_PKTLEN (-772103680L)
	7	#define ZERR_HEADERLEN (-772103679L)
	8	#define ZERR_ILLVAL (-772103678L)
	9	#define ZERR_HMPORT (-772103677L)
	10	#define ZERR_PORTINUSE (-772103676L)
	11	#define ZERR_BADPKT (-772103675L)
	12	#define ZERR_VERS (-772103674L)
	13	#define ZERR_NOPORT (-772103673L)
	14	#define ZERR_NONOTICE (-772103672L)
	15	#define ZERR_QLEN (-772103671L)
	16	#define ZERR_HMDEAD (-772103670L)
	17	#define ZERR_INTERNAL (-772103669L)
	18	#define ZERR_NOLOCATIONS (-772103668L)
	19	#define ZERR_NOMORELOCS (-772103667L)
	20	#define ZERR_FIELDLEN (-772103666L)
	21	#define ZERR_BADFIELD (-772103665L)
	22	#define ZERR_SERVNAK (-772103664L)
	23	#define ZERR_AUTHFAIL (-772103663L)
	24	#define ZERR_LOGINFAIL (-772103662L)
	25	#define ZERR_NOSUBSCRIPTIONS (-772103661L)
	26	#define ZERR_NOMORESUBSCRIPTIONS (-772103660L)
	27	#define ZERR_TOOMANYSUBS (-772103659L)
	28	#define ZERR_EOF (-772103658L)
	29	extern void initialize_zeph_error_table(void);
	30	#define ERROR_TABLE_BASE_zeph (-772103680L)
	31
	32	/* for compatibility with older versions... */
	33	#define init_zeph_err_tbl initialize_zeph_error_table
	34	#define zeph_err_base ERROR_TABLE_BASE_zeph

Lines 8-15 Link Here

(-)zephyr.orig/lib/Makefile.in (-6 / +14 lines)
8	lsbindir=@lsbindir@	8	lsbindir=@lsbindir@
9		9
10	includedir=${prefix}/include	10	includedir=${prefix}/include
11	mandir=${prefix}/man	11	mandir=@mandir@
12	libdir=${exec_prefix}/lib	12	libdir=${exec_prefix}/lib
		13	LIBS=@LIBS@
13		14
14	srcdir=@srcdir@	15	srcdir=@srcdir@
15	top_srcdir=@top_srcdir@	16	top_srcdir=@top_srcdir@
Lines 18-26 Link Here
18	CC=@CC@	19	CC=@CC@
19	INSTALL=@INSTALL@	20	INSTALL=@INSTALL@
20	RANLIB=@RANLIB@	21	RANLIB=@RANLIB@
21		22	FPIC=
		23	DEBUG=-O
22	CPPFLAGS=@CPPFLAGS@	24	CPPFLAGS=@CPPFLAGS@
23	CFLAGS=@CFLAGS@	25	CFLAGS=@CFLAGS@ ${DEBUG} ${FPIC}
24	ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \	26	ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \
25	-I${BUILDTOP}/h ${CPPFLAGS}	27	-I${BUILDTOP}/h ${CPPFLAGS}
26		28
Lines 34-45 Link Here
34	ZSendPkt.o ZSendRaw.o ZSendRLst.o ZSetDest.o ZSetFD.o ZSetSrv.o \	36	ZSendPkt.o ZSendRaw.o ZSendRLst.o ZSetDest.o ZSetFD.o ZSetSrv.o \
35	ZSubs.o ZVariables.o ZWait4Not.o Zinternal.o	37	ZSubs.o ZVariables.o ZWait4Not.o Zinternal.o
36		38
37	all: libzephyr.a	39	LIBEXT=a
		40	all: libzephyr.$(LIBEXT)
38		41
39	libzephyr.a: ${OBJS}	42	libzephyr.a: ${OBJS}
40	ar cru $@ ${OBJS}	43	ar cru $@ ${OBJS}
41	${RANLIB} $@	44	${RANLIB} $@
42		45
		46	libzephyr.so: $(OBJS)
		47	gcc -shared -Wl,-soname -Wl,libzephyr.so.$(SONAME) -o libzephyr.so $(OBJS) $(LIBS) -lcom_err
		48
43	zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et	49	zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et
44	compile_et ${srcdir}/zephyr_err.et	50	compile_et ${srcdir}/zephyr_err.et
45	mv zephyr_err.h ${BUILDTOP}/h/zephyr	51	mv zephyr_err.h ${BUILDTOP}/h/zephyr
Lines 49-56 Link Here
49		55
50	check:	56	check:
51		57
52	install: libzephyr.a	58	install: libzephyr.$(LIBEXT)
53	${INSTALL} -m 644 libzephyr.a ${DESTDIR}${libdir}	59	-${INSTALL} -m 644 libzephyr.a ${DESTDIR}${libdir}
		60	-$(INSTALL) -m 644 libzephyr.so ${DESTDIR}$(libdir)
		61
54	${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1	62	${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1
55		63
56	clean:	64	clean:

Lines 22-30 Link Here

(-)zephyr.orig/lib/ZOpenPort.c (-8 lines)
22	{	22	{
23	struct sockaddr_in bindin;	23	struct sockaddr_in bindin;
24	int len;	24	int len;
25	#ifdef SO_BSDCOMPAT
26	int on = 1;
27	#endif
28		25
29	(void) ZClosePort();	26	(void) ZClosePort();
30		27
Lines 33-43 Link Here
33	return (errno);	30	return (errno);
34	}	31	}
35		32
36	#ifdef SO_BSDCOMPAT
37	/* Prevent Linux from giving us socket errors we don't care about. */
38	setsockopt(__Zephyr_fd, SOL_SOCKET, SO_BSDCOMPAT, &on, sizeof(on));
39	#endif
40
41	bindin.sin_family = AF_INET;	33	bindin.sin_family = AF_INET;
42		34
43	if (port && *port)	35	if (port && *port)

Lines 36-41 Link Here

(-)zephyr.orig/server/kopt.c (-5 / +12 lines)
36		36
37	#define KRB_PROT_VERSION 4	37	#define KRB_PROT_VERSION 4
38		38
		39	#define swap_u_long(x) {\
		40	unsigned KRB4_32 _krb_swap_tmp[4];\
		41	swab((char ) &x, ((char ) _krb_swap_tmp) +2 ,2); \
		42	swab(((char ) &x) +2,((char ) _krb_swap_tmp),2); \
		43	x = _krb_swap_tmp[0]; \
		44	}
		45
39	/* Message types , always leave lsb for byte order */	46	/* Message types , always leave lsb for byte order */
40		47
41	#define AUTH_MSG_KDC_REQUEST 1<<1	48	#define AUTH_MSG_KDC_REQUEST 1<<1
Lines 232-242 Link Here
232	int	239	int
233	krb_rd_req(authent,service,instance,from_addr,ad,fn)	240	krb_rd_req(authent,service,instance,from_addr,ad,fn)
234	KTEXT authent; /* The received message */	241	KTEXT authent; /* The received message */
235	char service; / Service name */	242	char service; / Service name */
236	char instance; / Service instance */	243	char instance; / Service instance */
237	unsigned KRB_INT32 from_addr; /* Net address of originating host */	244	unsigned KRB4_32 from_addr; /* Net address of originating host */
238	AUTH_DAT ad; / Structure to be filled in */	245	AUTH_DAT ad; / Structure to be filled in */
239	char fn; / Filename to get keys from */	246	char fn; / Filename to get keys from */
240	{	247	{
241	KTEXT_ST ticket; /* Temp storage for ticket */	248	KTEXT_ST ticket; /* Temp storage for ticket */
242	KTEXT tkt = &ticket;	249	KTEXT tkt = &ticket;

Lines 91-99 Link Here

(-)zephyr.orig/server/main.c (-4 lines)
91	char programname; / set to the basename of argv[0] */	91	char programname; / set to the basename of argv[0] */
92	char myname[MAXHOSTNAMELEN]; /* my host name */	92	char myname[MAXHOSTNAMELEN]; /* my host name */
93		93
94	#ifndef HAVE_HESIOD
95	char list_file[128];	94	char list_file[128];
96	#endif
97	#ifdef HAVE_KRB4	95	#ifdef HAVE_KRB4
98	char srvtab_file[128];	96	char srvtab_file[128];
99	char my_realm[REALM_SZ];	97	char my_realm[REALM_SZ];
Lines 139-147 Link Here
139	extern char *optarg;	137	extern char *optarg;
140	extern int optind;	138	extern int optind;
141		139
142	#ifndef HAVE_HESIOD
143	sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE);	140	sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE);
144	#endif
145	#ifdef HAVE_KRB4	141	#ifdef HAVE_KRB4
146	sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB);	142	sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB);
147	sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE);	143	sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE);

Lines 619-630 Link Here

(-)zephyr.orig/server/realm.c (-2 / +6 lines)
619	zdbug((LOG_DEBUG, "rlm_deathgram: suggesting %s to %s",	619	zdbug((LOG_DEBUG, "rlm_deathgram: suggesting %s to %s",
620	(server) ? server->addr_str : "nothing", realm->name));	620	(server) ? server->addr_str : "nothing", realm->name));
621		621
		622	#ifdef HAVE_KRB4
622	if (!ticket_lookup(realm->name))	623	if (!ticket_lookup(realm->name))
623	if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {	624	if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
624	syslog(LOG_WARNING, "rlm_deathgram failed: %s",	625	syslog(LOG_WARNING, "rlm_deathgram failed: %s",
625	error_message(retval));	626	error_message(retval));
626	return;	627	return;
627	}	628	}
		629	#endif
628		630
629	if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH))	631	if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH))
630	!= ZERR_NONE)	632	!= ZERR_NONE)
Lines 683-694 Link Here
683	snotice.z_message = NULL;	685	snotice.z_message = NULL;
684	snotice.z_message_len = 0;	686	snotice.z_message_len = 0;
685		687
		688	#ifdef HAVE_KRB4
686	if (!ticket_lookup(realm->name))	689	if (!ticket_lookup(realm->name))
687	if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {	690	if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
688	syslog(LOG_WARNING, "rlm_wakeup failed: %s",	691	syslog(LOG_WARNING, "rlm_wakeup failed: %s",
689	error_message(retval));	692	error_message(retval));
690	continue;	693	continue;
691	}	694	}
		695	#endif
692		696
693	if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH))	697	if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH))
694	!= ZERR_NONE)	698	!= ZERR_NONE)
Lines 1227-1234 Link Here
1227	(void) sprintf(multi, "%d/%d", offset+origoffset, origlen);	1231	(void) sprintf(multi, "%d/%d", offset+origoffset, origlen);
1228	partnotice.z_multinotice = multi;	1232	partnotice.z_multinotice = multi;
1229	if (offset > 0) {	1233	if (offset > 0) {
1230	(void) gettimeofday(&partnotice.z_uid.tv,	1234	(void) Z_gettimeofday(&partnotice.z_uid.tv,
1231	(struct timezone *)0);	1235	(struct timezone *)0);
1232	partnotice.z_uid.tv.tv_sec = htonl((u_long)	1236	partnotice.z_uid.tv.tv_sec = htonl((u_long)
1233	partnotice.z_uid.tv.tv_sec);	1237	partnotice.z_uid.tv.tv_sec);
1234	partnotice.z_uid.tv.tv_usec =	1238	partnotice.z_uid.tv.tv_usec =

Lines 92-101 Link Here

(-)zephyr.orig/server/server.c (-15 / +8 lines)
92	#endif	92	#endif
93		93
94	static struct in_addr get_server_addrs __P((int number));	94	static struct in_addr get_server_addrs __P((int number));
95	#ifndef HAVE_HESIOD
96	static char *get_server_list __P((char file));	95	static char *get_server_list __P((char file));
97	static void free_server_list __P((char **list));	96	static void free_server_list __P((char **list));
98	#endif
99		97
100	static Unacked *srv_nacktab[SRV_NACKTAB_HASHSIZE];	98	static Unacked *srv_nacktab[SRV_NACKTAB_HASHSIZE];
101	Server otherservers; / points to an array of the known	99	Server otherservers; / points to an array of the known
Lines 981-1002 Link Here
981	int number; / RETURN */	979	int number; / RETURN */
982	{	980	{
983	int i;	981	int i;
984	char **server_hosts;	982	char **server_hosts = NULL;
		983	char **server_hosts_free = NULL;
985	char **cpp;	984	char **cpp;
986	struct in_addr *addrs;	985	struct in_addr *addrs;
987	struct in_addr *addr;	986	struct in_addr *addr;
988	struct hostent *hp;	987	struct hostent *hp;
989		988
		989	server_hosts = get_server_list(list_file);
		990	server_hosts_free = server_hosts;
990	#ifdef HAVE_HESIOD	991	#ifdef HAVE_HESIOD
991	/* get the names from Hesiod */
992	server_hosts = hes_resolve("zephyr","sloc");
993	if (!server_hosts)	992	if (!server_hosts)
994	return NULL;	993	server_hosts = hes_resolve("zephyr","sloc");
995	#else	994	#endif
996	server_hosts = get_server_list(list_file);
997	if (!server_hosts)	995	if (!server_hosts)
998	return NULL;	996	return NULL;
999	#endif
1000	/* count up */	997	/* count up */
1001	i = 0;	998	i = 0;
1002	for (cpp = server_hosts; *cpp; cpp++)	999	for (cpp = server_hosts; *cpp; cpp++)
Lines 1015-1028 Link Here
1015	}	1012	}
1016	}	1013	}
1017	*number = i;	1014	*number = i;
1018	#ifndef HAVE_HESIOD	1015	if (server_hosts_free)
1019	free_server_list(server_hosts);	1016	free_server_list(server_hosts_free);
1020	#endif
1021	return addrs;	1017	return addrs;
1022	}	1018	}
1023		1019
1024	#ifndef HAVE_HESIOD
1025
1026	static int nhosts = 0;	1020	static int nhosts = 0;
1027		1021
1028	/*	1022	/*
Lines 1090-1096 Link Here
1090	free(orig_list);	1084	free(orig_list);
1091	return;	1085	return;
1092	}	1086	}
1093	#endif
1094		1087
1095	/*	1088	/*
1096	* initialize the server structure for address addr, and set a timer	1089	* initialize the server structure for address addr, and set a timer

Lines 269-276 Link Here

(-)zephyr.orig/server/zserver.h (-4 / +2 lines)
269	Sched *check_key_sched_cache __P((des_cblock key));	269	Sched *check_key_sched_cache __P((des_cblock key));
270	void add_to_key_sched_cache __P((des_cblock key, Sched *sched));	270	void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
271	int krb_set_key __P((char *key, int cvt));	271	int krb_set_key __P((char *key, int cvt));
272	int krb_rd_req __P((KTEXT authent, char service, char instance,	272	/* int krb_rd_req __P((KTEXT authent, char service, char instance,
273	unsigned KRB_INT32 from_addr, AUTH_DAT ad, char fn));	273	unsigned KRB_INT32 from_addr, AUTH_DAT ad, char fn)); */
274	int krb_find_ticket __P((KTEXT authent, KTEXT ticket));	274	int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
275	int krb_get_lrealm __P((char *r, int n));	275	int krb_get_lrealm __P((char *r, int n));
276	#endif	276	#endif
Lines 354-362 Link Here
354	extern int nfds; /* number to look at in select() */	354	extern int nfds; /* number to look at in select() */
355	extern int zdebug;	355	extern int zdebug;
356	extern char myname[]; /* domain name of this host */	356	extern char myname[]; /* domain name of this host */
357	#ifndef HAVE_HESIOD
358	extern char list_file[];	357	extern char list_file[];
359	#endif
360	#ifdef HAVE_KRB4	358	#ifdef HAVE_KRB4
361	extern char srvtab_file[];	359	extern char srvtab_file[];
362	extern char my_realm[];	360	extern char my_realm[];

Lines 36-43 Link Here

(-)zephyr.orig/zwgc/tty_filter.c (-1 / +8 lines)
36		36
37	extern int tgetent();	37	extern int tgetent();
38	extern char tgetstr(),getenv();	38	extern char tgetstr(),getenv();
		39	#if 0
39	short ospeed;	40	short ospeed;
40	char PC;	41	char PC;
		42	#endif
41		43
42	/* Dictionary naming convention:	44	/* Dictionary naming convention:
43		45
Lines 91-96 Link Here
91	int ex;	93	int ex;
92	string_dictionary_binding *b;	94	string_dictionary_binding *b;
93	int isrealtty = string_Eq(drivername, "tty");	95	int isrealtty = string_Eq(drivername, "tty");
		96	#if 0
94	#ifdef HAVE_TERMIOS_H	97	#ifdef HAVE_TERMIOS_H
95	struct termios tbuf;	98	struct termios tbuf;
96		99
Lines 100-105 Link Here
100		103
101	ospeed = (ioctl(0, TIOCGETP, &sgttyb) == 0) ? sgttyb.sg_ospeed : 2400;	104	ospeed = (ioctl(0, TIOCGETP, &sgttyb) == 0) ? sgttyb.sg_ospeed : 2400;
102	#endif	105	#endif
		106	#endif
103		107
104	if (termcap_dict == (string_dictionary) NULL)	108	if (termcap_dict == (string_dictionary) NULL)
105	termcap_dict = string_dictionary_Create(7);	109	termcap_dict = string_dictionary_Create(7);
Lines 129-136 Link Here
129	/* We cheat here, and ignore the padding (if any) specified for	133	/* We cheat here, and ignore the padding (if any) specified for
130	the mode-change strings (it's a real pain to do "right") */	134	the mode-change strings (it's a real pain to do "right") */
131		135
		136	#if 0
132	tmp = tgetstr("pc", &p);	137	tmp = tgetstr("pc", &p);
133	PC = (tmp) ? *tmp : 0;	138	PC = (tmp) ? *tmp : 0;
		139	#endif
134	if (tmp = tgetstr("md",&p)) { /* bold ? */	140	if (tmp = tgetstr("md",&p)) { /* bold ? */
135	EXPAND("B.bold");	141	EXPAND("B.bold");
136	tmp = tgetstr("me",&p);	142	tmp = tgetstr("me",&p);
Lines 321-326 Link Here
321		327
322	/* Add new block (call it temp) to result: */	328	/* Add new block (call it temp) to result: */
323	temp = (tty_str_info *)malloc(sizeof(struct _tty_str_info));	329	temp = (tty_str_info *)malloc(sizeof(struct _tty_str_info));
		330	*temp = current_mode;
324	if (last_result_block) {	331	if (last_result_block) {
325	last_result_block->next = temp;	332	last_result_block->next = temp;
326	last_result_block = temp;	333	last_result_block = temp;
Lines 344-356 Link Here
344	}	351	}
345	if (desc->code == DT_STR) {	352	if (desc->code == DT_STR) {
346	/* just combine string info with current mode: */	353	/* just combine string info with current mode: */
347	*temp = current_mode;
348	temp->str = desc->str;	354	temp->str = desc->str;
349	temp->len = desc->len;	355	temp->len = desc->len;
350	} else if (desc->code == DT_NL) {	356	} else if (desc->code == DT_NL) {
351	/* make the new block a ' ' alignment block with an empty string */	357	/* make the new block a ' ' alignment block with an empty string */
352	temp->alignment = ' ';	358	temp->alignment = ' ';
353	temp->len = 0;	359	temp->len = 0;
		360	temp->ignore = 0;
354	}	361	}
355	}	362	}
356		363

Lines 380-386 Link Here

(-)zephyr.orig/zwgc/zwgc.1 (-31 / +31 lines)
380	.TP	380	.TP
381	.B break	381	.B break
382	Exits the innermost if, case, or while block.	382	Exits the innermost if, case, or while block.
383	.if n .ll +2in	383	.\" .if n .ll +2in
384	.TP	384	.TP
385	\fBcase \fIexpr1\fR [ ((\fBmatch \fIexpr\fR [,\fIexpr ...\fR]) \| \fBdefault\fR)\fI commands \fR] ... \fBendcase\fR	385	\fBcase \fIexpr1\fR [ ((\fBmatch \fIexpr\fR [,\fIexpr ...\fR]) \| \fBdefault\fR)\fI commands \fR] ... \fBendcase\fR
386	Evaluates \fIexpr1\fR. Then, each of the match expressions is	386	Evaluates \fIexpr1\fR. Then, each of the match expressions is
Lines 427-433 Link Here
427	Completes processing of the current notice. The remainder of the	427	Completes processing of the current notice. The remainder of the
428	description file is ignored after execution of this command.	428	description file is ignored after execution of this command.
429	.\" hack because the following line otherwise breaks because it is too long.	429	.\" hack because the following line otherwise breaks because it is too long.
430	.if n .ll +2in	430	.\" .if n .ll +2in
431	.TP	431	.TP
432	\fBif \fIexpr1 \fBthen \fIcommands1\fR [\fBelseif \fIexpr2 \fBthen \fIcommands2\fR] ... [\fBelse \fIcommandsn\fR] \fBendif\fR	432	\fBif \fIexpr1 \fBthen \fIcommands1\fR [\fBelseif \fIexpr2 \fBthen \fIcommands2\fR] ... [\fBelse \fIcommandsn\fR] \fBendif\fR
433	If \fIexpr1\fR evaluates to true, execute \fIcommands1\fI, etc. [A conditional	433	If \fIexpr1\fR evaluates to true, execute \fIcommands1\fI, etc. [A conditional
Lines 538-553 Link Here
538	.\" .TQ 15	538	.\" .TQ 15
539	.\" @em	539	.\" @em
540	.\" Emphasis. Use underline if available, else reverse video.	540	.\" Emphasis. Use underline if available, else reverse video.
541	.TQ 15	541	.TP
542	@roman	542	@roman
543	Roman (plain) letters (turns off all special modes).	543	Roman (plain) letters (turns off all special modes).
544	.TQ	544	.TP
545	@b or @bold	545	@b or @bold
546	Bold letters. If not available, reverse video, else underline.	546	Bold letters. If not available, reverse video, else underline.
547	.TQ	547	.TP
548	@i or @italic	548	@i or @italic
549	Italic letters (underlining, if available).	549	Italic letters (underlining, if available).
550	.TQ	550	.TP
551	@beep	551	@beep
552	"bl" termcap entry, else "^G" (beep the terminal); limited to once per	552	"bl" termcap entry, else "^G" (beep the terminal); limited to once per
553	message.	553	message.
Lines 560-572 Link Here
560	.\" .TQ	560	.\" .TQ
561	.\" @u	561	.\" @u
562	.\" "us"/"ue" termcap entry.	562	.\" "us"/"ue" termcap entry.
563	.TQ	563	.TP
564	@l or @left	564	@l or @left
565	left aligned	565	left aligned
566	.TQ	566	.TP
567	@c or @center	567	@c or @center
568	center aligned	568	center aligned
569	.TQ	569	.TP
570	@r or @right	570	@r or @right
571	right aligned	571	right aligned
572	.RE	572	.RE
Lines 578-611 Link Here
578	formatted according to @ commands embedded in the string. Supported	578	formatted according to @ commands embedded in the string. Supported
579	@ commands are:	579	@ commands are:
580	.RS 10	580	.RS 10
581	.TQ 15	581	.TP 15
582	@roman	582	@roman
583	turns off @italic and @bold	583	turns off @italic and @bold
584	.TQ	584	.TP
585	@b or @bold	585	@b or @bold
586	turns on boldface	586	turns on boldface
587	.TQ	587	.TP
588	@i or @italic	588	@i or @italic
589	turns on italics	589	turns on italics
590	.TQ	590	.TP
591	@l or @left	591	@l or @left
592	left aligned	592	left aligned
593	.TQ	593	.TP
594	@c or @center	594	@c or @center
595	center aligned	595	center aligned
596	.TQ	596	.TP
597	@r or @right	597	@r or @right
598	right aligned	598	right aligned
599	.TQ	599	.TP
600	@large	600	@large
601	large type size	601	large type size
602	.TQ	602	.TP
603	@medium	603	@medium
604	medium type size	604	medium type size
605	.TQ	605	.TP
606	@small	606	@small
607	small type size	607	small type size
608	.TQ	608	.TP
609	@beep	609	@beep
610	Ring the X bell (limited to once per message)	610	Ring the X bell (limited to once per message)
611	.TP	611	.TP
Lines 643-661 Link Here
643	.IP	643	.IP
644	Zwgc variables which the X output device reads are:	644	Zwgc variables which the X output device reads are:
645	.RS 10	645	.RS 10
646	.TQ 15	646	.TP 15
647	default_X_geometry	647	default_X_geometry
648	default geometry for notices, set from resources	648	default geometry for notices, set from resources
649	.TQ	649	.TP
650	X_geometry	650	X_geometry
651	overrides geometry in resource file, if set	651	overrides geometry in resource file, if set
652	.TQ	652	.TP
653	default_X_background	653	default_X_background
654	default background color for notices, set from resources	654	default background color for notices, set from resources
655	.TQ	655	.TP
656	X_background	656	X_background
657	overrides bgcolor in resource file, if set	657	overrides bgcolor in resource file, if set
658	.TQ	658	.TP
659	style	659	style
660	style, as described above	660	style, as described above
661	.RE	661	.RE
Lines 1018-1042 Link Here
1018	which case you must get new tickets and then run ``zctl load	1018	which case you must get new tickets and then run ``zctl load
1019	/dev/null''.)	1019	/dev/null''.)
1020	.SH FILES	1020	.SH FILES
1021	.TQ 15	1021	.TP 15
1022	$HOME/.zwgc.desc	1022	$HOME/.zwgc.desc
1023	Default location of user's description file	1023	Default location of user's description file
1024	.TQ	1024	.TP
1025	/usr/athena/share/zephyr/zwgc.desc	1025	/usr/athena/share/zephyr/zwgc.desc
1026	System-wide description file	1026	System-wide description file
1027	.TQ	1027	.TP
1028	/usr/athena/share/zephyr/zwgc_resources	1028	/usr/athena/share/zephyr/zwgc_resources
1029	Default X application resources.	1029	Default X application resources.
1030	.TQ	1030	.TP
1031	$HOME/.zephyr.vars	1031	$HOME/.zephyr.vars
1032	File containing variable definitions	1032	File containing variable definitions
1033	.TQ	1033	.TP
1034	$HOME/.zephyr.subs	1034	$HOME/.zephyr.subs
1035	Supplementary subscription file	1035	Supplementary subscription file
1036	.TQ	1036	.TP
1037	$HOME/.Xresources	1037	$HOME/.Xresources
1038	Standard X resources file	1038	Standard X resources file
1039	.TQ	1039	.TP
1040	$WGFILE or /tmp/wg.\fIuid\fR	1040	$WGFILE or /tmp/wg.\fIuid\fR
1041	File used to store WindowGram port number for other clients	1041	File used to store WindowGram port number for other clients
1042	.SH SEE ALSO	1042	.SH SEE ALSO