cvs commit: patches/Libnet Libnet-1.0.2a-fixes-1.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Oct 5 14:54:41 PDT 2003


jim         03/10/05 15:54:41

  Added:       Libnet   Libnet-1.0.2a-fixes-1.patch
  Log:
  Added: Libnet-1.0.2a-fixes-1.patch
  
  Revision  Changes    Path
  1.1                  patches/Libnet/Libnet-1.0.2a-fixes-1.patch
  
  Index: Libnet-1.0.2a-fixes-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-09-17
  Initial Package Version: 1.0.2a
  Origin: Debian Maintainer
  Description: Fixes Makefile and Configure
  	     Adds missing header files
  	     Fixes GCC 3.3 errors
   
  diff -Naur Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
  --- Libnet-1.0.2a.orig/Makefile.in	2001-02-05 17:51:41.000000000 +0000
  +++ Libnet-1.0.2a/Makefile.in	2003-09-18 05:34:51.000000000 +0000
  @@ -74,6 +74,7 @@
   supp: test example
   
   libnet: version.h $(OBJECTS)
  +	mkdir -p lib
   	$(AR) -cr $(LIB) $(OBJECTS)
   	$(RANLIB) $(LIB)
   
  @@ -109,9 +110,7 @@
   	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
   	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
   	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
  -	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
  -
  -
  +	$(INSTALL_DATA) -m 755 $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
   
   clean:
   	if test -f test/Makefile; then \
  diff -Naur Libnet-1.0.2a.orig/config.guess Libnet-1.0.2a/config.guess
  --- Libnet-1.0.2a.orig/config.guess	2000-05-25 00:28:49.000000000 +0000
  +++ Libnet-1.0.2a/config.guess	2003-09-18 05:34:51.000000000 +0000
  @@ -1,7 +1,10 @@
   #! /bin/sh
   # Attempt to guess a canonical system name.
  -#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
  -#
  +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  +#   2000, 2001, 2002 Free Software Foundation, Inc.
  +
  +timestamp='2002-01-02'
  +
   # 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
  @@ -21,59 +24,284 @@
   # configuration script generated by Autoconf, you may include it under
   # the same distribution terms that you use for the rest of that program.
   
  -# Written by Per Bothner <bothner at cygnus.com>.
  -# The master version of this file is at the FSF in /home/gd/gnu/lib.
  +# Originally written by Per Bothner <bothner at cygnus.com>.
  +# Please send patches to <config-patches at 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 system type (host/target name).
  -#
  -# Only a few systems have been added to this list; please add others
  -# (but try to keep the structure clean).
  -#
  +# 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 at gnu.org>."
  +
  +version="\
  +GNU config.guess ($timestamp)
  +
  +Originally written by Per Bothner.
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  +Free Software Foundation, Inc.
  +
  +This is free software; see the source for copying conditions.  There is NO
  +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
  +
  +help="
  +Try \`$me --help' for more information."
  +
  +# Parse command line
  +while test $# -gt 0 ; do
  +  case $1 in
  +    --time-stamp | --time* | -t )
  +       echo "$timestamp" ; exit 0 ;;
  +    --version | -v )
  +       echo "$version" ; exit 0 ;;
  +    --help | --h* | -h )
  +       echo "$usage"; exit 0 ;;
  +    -- )     # Stop option processing
  +       shift; break ;;
  +    - )	# Use stdin as input.
  +       break ;;
  +    -* )
  +       echo "$me: invalid option $1$help" >&2
  +       exit 1 ;;
  +    * )
  +       break ;;
  +  esac
  +done
  +
  +if test $# != 0; then
  +  echo "$me: too many arguments$help" >&2
  +  exit 1
  +fi
  +
  +
  +dummy=dummy-$$
  +trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
  +
  +# CC_FOR_BUILD -- compiler used by this script.
  +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  +# use `HOST_CC' if defined, but it is deprecated.
  +
  +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
  + ,,)    echo "int dummy(){}" > $dummy.c ;
  +	for c in cc gcc c89 ; do
  +	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
  +	  if test $? = 0 ; then
  +	     CC_FOR_BUILD="$c"; break ;
  +	  fi ;
  +	done ;
  +	rm -f $dummy.c $dummy.o $dummy.rel ;
  +	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 at noc.rutgers.edu 8/24/94.)
  +# (ghazi at 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_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".
  +	UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
  +	    UNAME_MACHINE_ARCH=unknown
  +	case "${UNAME_MACHINE_ARCH}" in
  +	    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
  +	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  +	# 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 ;;
  +    amiga:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    arc:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    hp300:OpenBSD:*:*)
  +	echo m68k-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 ;;
  +    pmax:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    sgi:OpenBSD:*:*)
  +	echo mipseb-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    sun3:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    wgrisc:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:OpenBSD:*:*)
  +	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
       alpha:OSF1:*:*)
  +	if test $UNAME_RELEASE = "V4.0"; then
  +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
  +	fi
   	# 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 alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
  +	cat <<EOF >$dummy.s
  +	.data
  +\$Lformat:
  +	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
  +
  +	.text
  +	.globl main
  +	.align 4
  +	.ent main
  +main:
  +	.frame \$30,16,\$26,0
  +	ldgp \$29,0(\$27)
  +	.prologue 1
  +	.long 0x47e03d80 # implver \$0
  +	lda \$2,-1
  +	.long 0x47e20c21 # amask \$2,\$1
  +	lda \$16,\$Lformat
  +	mov \$0,\$17
  +	not \$1,\$18
  +	jsr \$26,printf
  +	ldgp \$29,0(\$26)
  +	mov 0,\$16
  +	jsr \$26,exit
  +	.end main
  +EOF
  +	eval $set_cc_for_build
  +	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
  +	if test "$?" = 0 ; then
  +		case `./$dummy` in
  +			0-0)
  +				UNAME_MACHINE="alpha"
  +				;;
  +			1-0)
  +				UNAME_MACHINE="alphaev5"
  +				;;
  +			1-1)
  +				UNAME_MACHINE="alphaev56"
  +				;;
  +			1-101)
  +				UNAME_MACHINE="alphapca56"
  +				;;
  +			2-303)
  +				UNAME_MACHINE="alphaev6"
  +				;;
  +			2-307)
  +				UNAME_MACHINE="alphaev67"
  +				;;
  +			2-1307)
  +				UNAME_MACHINE="alphaev68"
  +				;;
  +		esac
  +	fi
  +	rm -f $dummy.s $dummy
  +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | 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
   	exit 0 ;;
       21064:Windows_NT:50:3)
   	echo alpha-dec-winnt3.5
   	exit 0 ;;
       Amiga*:UNIX_System_V:4.0:*)
  -	echo m68k-cbm-sysv4
  +	echo m68k-unknown-sysv4
   	exit 0;;
  -    amiga:NetBSD:*:*)
  -      echo m68k-cbm-netbsd${UNAME_RELEASE}
  -      exit 0 ;;
  -    amiga:OpenBSD:*:*)
  -      echo m68k-cbm-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 ;;
       arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   	echo arm-acorn-riscix${UNAME_RELEASE}
   	exit 0;;
  -    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
  +    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
  +	echo hppa1.1-hitachi-hiuxmpp
  +	exit 0;;
  +    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
   	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
   	if test "`(/bin/universe) 2>/dev/null`" = att ; then
   		echo pyramid-pyramid-sysv3
  @@ -81,9 +309,12 @@
   		echo pyramid-pyramid-bsd
   	fi
   	exit 0 ;;
  -    NILE:*:*:dcosx)
  +    NILE*:*:*:dcosx)
   	echo pyramid-pyramid-svr4
   	exit 0 ;;
  +    sun4H:SunOS:5.*:*)
  +	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  +	exit 0 ;;
       sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   	exit 0 ;;
  @@ -108,27 +339,47 @@
       sun3*:SunOS:*:*)
   	echo m68k-sun-sunos${UNAME_RELEASE}
   	exit 0 ;;
  +    sun*:*:4.2BSD:*)
  +	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  +	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
  +	case "`/bin/arch`" in
  +	    sun3)
  +		echo m68k-sun-sunos${UNAME_RELEASE}
  +		;;
  +	    sun4)
  +		echo sparc-sun-sunos${UNAME_RELEASE}
  +		;;
  +	esac
  +	exit 0 ;;
       aushp:SunOS:*:*)
   	echo sparc-auspex-sunos${UNAME_RELEASE}
   	exit 0 ;;
  -    atari*:NetBSD:*:*)
  -	echo m68k-atari-netbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    atari*:OpenBSD:*:*)
  -	echo m68k-atari-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    sun3*:NetBSD:*:*)
  -	echo m68k-sun-netbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    sun3*:OpenBSD:*:*)
  -	echo m68k-sun-openbsd${UNAME_RELEASE}
  +    # 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 ;;
  -    mac68k:NetBSD:*:*)
  -	echo m68k-apple-netbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    mac68k:OpenBSD:*:*)
  -	echo m68k-apple-openbsd${UNAME_RELEASE}
  +    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
  +	echo m68k-atari-mint${UNAME_RELEASE}
  +        exit 0 ;;
  +    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
  +        echo m68k-atari-mint${UNAME_RELEASE}
   	exit 0 ;;
  +    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
  +        echo m68k-milan-mint${UNAME_RELEASE}
  +        exit 0 ;;
  +    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
  +        echo m68k-hades-mint${UNAME_RELEASE}
  +        exit 0 ;;
  +    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
  +        echo m68k-unknown-mint${UNAME_RELEASE}
  +        exit 0 ;;
       powerpc:machten:*:*)
   	echo powerpc-apple-machten${UNAME_RELEASE}
   	exit 0 ;;
  @@ -141,9 +392,18 @@
       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)
  -	sed 's/^	//' << EOF >dummy.c
  -	int main (argc, argv) int argc; char **argv; {
  +	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);
  @@ -158,12 +418,15 @@
   	  exit (-1);
   	}
   EOF
  -	${CC-cc} dummy.c -o dummy \
  -	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
  -	  && rm dummy.c dummy && exit 0
  -	rm -f dummy.c dummy
  +	$CC_FOR_BUILD $dummy.c -o $dummy \
  +	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
  +	  && rm -f $dummy.c $dummy && exit 0
  +	rm -f $dummy.c $dummy
   	echo mips-mips-riscos${UNAME_RELEASE}
   	exit 0 ;;
  +    Motorola:PowerMAX_OS:*:*)
  +	echo powerpc-motorola-powermax
  +	exit 0 ;;
       Night_Hawk:Power_UNIX:*:*)
   	echo powerpc-harris-powerunix
   	exit 0 ;;
  @@ -179,15 +442,18 @@
       AViiON:dgux:*:*)
           # DG/UX returns AViiON for all architectures
           UNAME_PROCESSOR=`/usr/bin/uname -p`
  -        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
  -	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
  -	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
  +	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
  +	    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
  @@ -208,12 +474,21 @@
       ????????: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:*:*)
  +    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
  -		sed 's/^		//' << EOF >dummy.c
  +		eval $set_cc_for_build
  +		sed 's/^		//' << EOF >$dummy.c
   		#include <sys/systemcfg.h>
   
   		main()
  @@ -224,8 +499,8 @@
   			exit(0);
   			}
   EOF
  -		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
  -		rm -f dummy.c dummy
  +		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $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
  @@ -233,8 +508,9 @@
   		echo rs6000-ibm-aix3.2
   	fi
   	exit 0 ;;
  -    *:AIX:*:4)
  -	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
  +    *:AIX:*:[45])
  +	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | 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
  @@ -242,7 +518,7 @@
   	if [ -x /usr/bin/oslevel ] ; then
   		IBM_REV=`/usr/bin/oslevel`
   	else
  -		IBM_REV=4.${UNAME_RELEASE}
  +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   	fi
   	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
   	exit 0 ;;
  @@ -252,7 +528,7 @@
       ibmrt:4.4BSD:*|romp-ibm:BSD:*)
   	echo romp-ibm-bsd4.4
   	exit 0 ;;
  -    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
  +    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:*:*)
  @@ -267,18 +543,75 @@
       hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
   	echo m68k-hp-bsd4.4
   	exit 0 ;;
  -    9000/[3478]??:HP-UX:*:*)
  +    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/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
  -	    9000/8?? )            HP_ARCH=hppa1.0 ;;
  +	    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;
  +              		default: puts ("hppa2.0"); break;
  +              		} break;
  +              #else  /* !defined(_SC_KERNEL_BITS) */
  +              	    puts ("hppa2.0"); break;
  +              #endif
  +              	default: puts ("hppa1.0"); break;
  +              	}
  +                  exit (0);
  +              }
  +EOF
  +		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
  +		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
  +		    rm -f $dummy.c $dummy
  +		fi ;;
   	esac
  -	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   	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:*:*)
  -	sed 's/^	//' << EOF >dummy.c
  +	eval $set_cc_for_build
  +	sed 's/^	//' << EOF >$dummy.c
   	#include <unistd.h>
   	int
   	main ()
  @@ -303,8 +636,8 @@
   	  exit (0);
   	}
   EOF
  -	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
  -	rm -f dummy.c dummy
  +	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $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:*:* )
  @@ -313,13 +646,16 @@
       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:*:*)
  +    i*86:OSF1:*:*)
   	if [ -x /usr/sbin/sysversion ] ; then
   	    echo ${UNAME_MACHINE}-unknown-osf1mk
   	else
  @@ -351,112 +687,232 @@
   	echo xmp-cray-unicos
           exit 0 ;;
       CRAY*Y-MP:*:*:*)
  -	echo ymp-cray-unicos${UNAME_RELEASE}
  +	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 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
  +	      -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
       CRAY*TS:*:*:*)
  -	echo t90-cray-unicos${UNAME_RELEASE}
  +	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  +	exit 0 ;;
  +    CRAY*T3D:*:*:*)
  +	echo alpha-cray-unicosmk${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 ;;
       CRAY-2:*:*:*)
   	echo cray2-cray-unicos
           exit 0 ;;
  -    F300:UNIX_System_V:*:*)
  -        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
  +    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 "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
  +        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
           exit 0 ;;
  -    F301:UNIX_System_V:*:*)
  -       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
  -       exit 0 ;;
  -    hp3[0-9][05]:NetBSD:*:*)
  -	echo m68k-hp-netbsd${UNAME_RELEASE}
  +    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  +	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   	exit 0 ;;
  -    hp3[0-9][05]:OpenBSD:*:*)
  -	echo m68k-hp-openbsd${UNAME_RELEASE}
  +    sparc*:BSD/OS:*:*)
  +	echo sparc-unknown-bsdi${UNAME_RELEASE}
   	exit 0 ;;
  -    i?86:BSD/386:*:* | *:BSD/OS:*:*)
  -	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  +    *: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/[-_].*/\./'`
  +    i*:CYGWIN*:*)
  +	echo ${UNAME_MACHINE}-pc-cygwin
   	exit 0 ;;
  -    *:OpenBSD:*:*)
  -	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  +    i*:MINGW*:*)
  +	echo ${UNAME_MACHINE}-pc-mingw32
   	exit 0 ;;
  -    i*:CYGWIN*:*)
  -	echo i386-pc-cygwin32
  +    i*:PW*:*)
  +	echo ${UNAME_MACHINE}-pc-pw32
  +	exit 0 ;;
  +    x86:Interix*:3*)
  +	echo i386-pc-interix3
  +	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 i386-pc-interix
  +	exit 0 ;;
  +    i*:UWIN*:*)
  +	echo ${UNAME_MACHINE}-pc-uwin
   	exit 0 ;;
       p*:CYGWIN*:*)
  -	echo powerpcle-unknown-cygwin32
  +	echo powerpcle-unknown-cygwin
   	exit 0 ;;
       prep*:SunOS:5.*:*)
   	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   	exit 0 ;;
       *:GNU:*:*)
  -	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  +	exit 0 ;;
  +    i*86:Minix:*:*)
  +	echo ${UNAME_MACHINE}-pc-minix
  +	exit 0 ;;
  +    arm*:Linux:*:*)
  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  +	exit 0 ;;
  +    ia64:Linux:*:*)
  +	echo ${UNAME_MACHINE}-unknown-linux
  +	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=`
  +	rm -f $dummy.c
  +	test x"${CPU}" != x && echo "${CPU}-pc-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 ;;
  -    *:Linux:*:*)
  +    s390:Linux:*:* | s390x:Linux:*:*)
  +	echo ${UNAME_MACHINE}-ibm-linux
  +	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.
  -	ld_help_string=`ld --help 2>&1`
  -	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
  -	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
  -	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
  -	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
  -	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
  -	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
  -	  echo "powerpc-unknown-linux-gnu" ; exit 0
  -	elif test "${UNAME_MACHINE}" = "alpha" ; then
  -	  echo alpha-unknown-linux-gnu ; exit 0
  -	elif test "${UNAME_MACHINE}" = "sparc" ; then
  -	  echo sparc-unknown-linux-gnu ; exit 0
  -	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.
  -	  test ! -d /usr/lib/ldscripts/. \
  -	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
  -	  # Determine whether the default compiler is a.out or elf
  -	  cat >dummy.c <<EOF
  -main(argc, argv)
  -int argc;
  -char *argv[];
  -{
  -#ifdef __ELF__
  -  printf ("%s-pc-linux-gnu\n", argv[1]);
  -#else
  -  printf ("%s-pc-linux-gnuaout\n", argv[1]);
  -#endif
  -  return 0;
  -}
  +	# 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.
  +	ld_supported_targets=`cd /; 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
  +	LIBC=gnuaout
  +	#endif
   EOF
  -	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
  -	  rm -f dummy.c dummy
  -	fi ;;
  -# 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.
  -    i?86:DYNIX/ptx:4*:*)
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
  +	rm -f $dummy.c
  +	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:*:4.*:* | i?86:SYSTEM_V:4.*:*)
  +    i*86:UNIX_SV:4.2MP:2.*)
  +        # Unixware is an offshoot of SVR4, but it has its own version
  +        # number series starting with 2...
  +        # I am not positive that other SVR4 systems won't match this,
  +	# I just have to hope.  -- rms.
  +        # Use sysv4.2uw... so that sysv4* matches it.
  +	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  +	exit 0 ;;
  +    i*86:*: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_RELEASE}
  +		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
   	else
  -		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
  +		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
   	fi
   	exit 0 ;;
  -    i?86:*:3.2:*)
  +    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
  @@ -465,11 +921,24 @@
   		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
   		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
   			&& UNAME_MACHINE=i586
  +		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
  +			&& UNAME_MACHINE=i686
  +		(/bin/uname -X|egrep '^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:*DOS:*:*)
  +	echo ${UNAME_MACHINE}-pc-msdosdjgpp
  +	exit 0 ;;
  +    pc:*:*:*)
  +	# Left here for compatibility:
  +        # uname -m prints for DJGPP always 'pc', but it prints nothing about
  +        # the processor, so we play safe by assuming i386.
  +	echo i386-pc-msdosdjgpp
  +        exit 0 ;;
       Intel:Mach:3*:*)
   	echo i386-pc-mach3
   	exit 0 ;;
  @@ -489,7 +958,7 @@
   	exit 0 ;;
       M68*:*:R3V[567]*:*)
   	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
  -    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
  +    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
   	OS_REL=''
   	test -r /etc/.relid \
   	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  @@ -500,24 +969,30 @@
       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: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.*:*)
  +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
   	echo i386-unknown-lynxos${UNAME_RELEASE}
   	exit 0 ;;
       TSUNAMI:LynxOS:2.*:*)
   	echo sparc-unknown-lynxos${UNAME_RELEASE}
   	exit 0 ;;
  -    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
  +    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 ;;
  @@ -529,6 +1004,10 @@
   		echo ns32k-sni-sysv
   	fi
   	exit 0 ;;
  +    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
  +                      # says <Richard.M.Bartel at ccMail.Census.GOV>
  +        echo i586-unisys-sysv4
  +        exit 0 ;;
       *:UNIX_System_V:4*:FTX*)
   	# From Gerald Hewes <hewes at openmarket.com>.
   	# How about differentiating between stratus architectures? -djm
  @@ -538,26 +1017,115 @@
   	# From seanf at swdc.stratus.com.
   	echo i860-stratus-sysv4
   	exit 0 ;;
  +    *:VOS:*:*)
  +	# From Paul.Green at stratus.com.
  +	echo hppa1.1-stratus-vos
  +	exit 0 ;;
       mc68*:A/UX:*:*)
   	echo m68k-apple-aux${UNAME_RELEASE}
   	exit 0 ;;
  -    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
  +    news*:NEWS-OS:6*:*)
  +	echo mips-sony-newsos6
  +	exit 0 ;;
  +    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
   	if [ -d /usr/nec ]; then
   	        echo mips-nec-sysv${UNAME_RELEASE}
   	else
   	        echo mips-unknown-sysv${UNAME_RELEASE}
   	fi
           exit 0 ;;
  -    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
  -                           # says <Richard.M.Bartel at ccMail.Census.GOV>
  -        echo i586-unisys-sysv4
  -        exit 0 ;;
  +    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  +	echo powerpc-be-beos
  +	exit 0 ;;
  +    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
  +	echo powerpc-apple-beos
  +	exit 0 ;;
  +    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  +	echo i586-pc-beos
  +	exit 0 ;;
  +    SX-4:SUPER-UX:*:*)
  +	echo sx4-nec-superux${UNAME_RELEASE}
  +	exit 0 ;;
  +    SX-5:SUPER-UX:*:*)
  +	echo sx5-nec-superux${UNAME_RELEASE}
  +	exit 0 ;;
  +    Power*:Rhapsody:*:*)
  +	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:Rhapsody:*:*)
  +	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:Darwin:*:*)
  +	echo `uname -p`-apple-darwin${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:procnto*:*:* | *:QNX:[0123456789]*:*)
  +	if test "${UNAME_MACHINE}" = "x86pc"; then
  +		UNAME_MACHINE=pc
  +	fi
  +	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
  +	exit 0 ;;
  +    *:QNX:*:4*)
  +	echo i386-pc-qnx
  +	exit 0 ;;
  +    NSR-[GKLNPTVW]: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 ;;
  +    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 ;;
  +    *: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 ;;
  +    i*86:XTS-300:*:STOP)
  +	echo ${UNAME_MACHINE}-unknown-stop
  +	exit 0 ;;
  +    i*86:atheos:*:*)
  +	echo ${UNAME_MACHINE}-unknown-atheos
  +	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
   
  -cat >dummy.c <<EOF
  +eval $set_cc_for_build
  +cat >$dummy.c <<EOF
   #ifdef _SEQUENT_
   # include <sys/types.h>
   # include <sys/utsname.h>
  @@ -595,7 +1163,10 @@
   #endif
     int version;
     version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  -  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  +  if (version < 4)
  +    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  +  else
  +    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
     exit (0);
   #endif
   
  @@ -640,11 +1211,24 @@
   #endif
   
   #if defined (vax)
  -#if !defined (ultrix)
  -  printf ("vax-dec-bsd\n"); exit (0);
  -#else
  -  printf ("vax-dec-ultrix\n"); exit (0);
  -#endif
  +# 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)
  @@ -655,8 +1239,8 @@
   }
   EOF
   
  -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
  -rm -f dummy.c dummy
  +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
  +rm -f $dummy.c $dummy
   
   # Apollos put the system type in the environment.
   
  @@ -688,6 +1272,48 @@
       esac
   fi
   
  -#echo '(Unable to guess system type)' 1>&2
  +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
  +
  +    ftp://ftp.gnu.org/pub/gnu/config/
  +
  +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 at 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:
  diff -Naur Libnet-1.0.2a.orig/config.sub Libnet-1.0.2a/config.sub
  --- Libnet-1.0.2a.orig/config.sub	2001-02-06 23:14:20.000000000 +0000
  +++ Libnet-1.0.2a/config.sub	2003-09-18 05:34:51.000000000 +0000
  @@ -1,6 +1,10 @@
   #! /bin/sh
  -# Configuration validation subroutine script, version 1.1.
  -#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
  +# Configuration validation subroutine script.
  +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  +#   2000, 2001, 2002 Free Software Foundation, Inc.
  +
  +timestamp='2002-01-02'
  +
   # This file is (in principle) common to ALL GNU software.
   # The presence of a machine in this file suggests that SOME GNU software
   # can handle that machine.  It does not imply ALL GNU software can.
  @@ -25,6 +29,9 @@
   # configuration script generated by Autoconf, you may include it under
   # the same distribution terms that you use for the rest of that program.
   
  +# Please send patches to <config-patches at gnu.org>.  Submit a context
  +# diff and a properly formatted ChangeLog entry.
  +#
   # Configuration subroutine to validate and canonicalize a configuration type.
   # Supply the specified configuration type as an argument.
   # If it is invalid, we print an error message on stderr and exit with code 1.
  @@ -45,30 +52,73 @@
   #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
   # It is wrong to echo any other type of specification.
   
  -if [ x$1 = x ]
  -then
  -	echo Configuration name missing. 1>&2
  -	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
  -	echo "or     $0 ALIAS" 1>&2
  -	echo where ALIAS is a recognized configuration type. 1>&2
  -	exit 1
  -fi
  +me=`echo "$0" | sed -e 's,.*/,,'`
   
  -# First pass through any local machine types.
  -case $1 in
  -	*local*)
  -		echo $1
  -		exit 0
  -		;;
  -	*)
  -	;;
  +usage="\
  +Usage: $0 [OPTION] CPU-MFR-OPSYS
  +       $0 [OPTION] ALIAS
  +
  +Canonicalize a configuration name.
  +
  +Operation modes:
  +  -h, --help         print this help, then exit
  +  -t, --time-stamp   print date of last modification, then exit
  +  -v, --version      print version number, then exit
  +
  +Report bugs and patches to <config-patches at gnu.org>."
  +
  +version="\
  +GNU config.sub ($timestamp)
  +
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  +Free Software Foundation, Inc.
  +
  +This is free software; see the source for copying conditions.  There is NO
  +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
  +
  +help="
  +Try \`$me --help' for more information."
  +
  +# Parse command line
  +while test $# -gt 0 ; do
  +  case $1 in
  +    --time-stamp | --time* | -t )
  +       echo "$timestamp" ; exit 0 ;;
  +    --version | -v )
  +       echo "$version" ; exit 0 ;;
  +    --help | --h* | -h )
  +       echo "$usage"; exit 0 ;;
  +    -- )     # Stop option processing
  +       shift; break ;;
  +    - )	# Use stdin as input.
  +       break ;;
  +    -* )
  +       echo "$me: invalid option $1$help"
  +       exit 1 ;;
  +
  +    *local*)
  +       # First pass through any local machine types.
  +       echo $1
  +       exit 0;;
  +
  +    * )
  +       break ;;
  +  esac
  +done
  +
  +case $# in
  + 0) echo "$me: missing argument$help" >&2
  +    exit 1;;
  + 1) ;;
  + *) echo "$me: too many arguments$help" >&2
  +    exit 1;;
   esac
   
   # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   # Here we must recognize all the valid KERNEL-OS combinations.
   maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   case $maybe_os in
  -  linux-gnu*)
  +  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
       os=-$maybe_os
       basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
       ;;
  @@ -94,15 +144,33 @@
   	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
  -	-apple)
  +	-apple | -axis)
  +		os=
  +		basic_machine=$1
  +		;;
  +	-sim | -cisco | -oki | -wec | -winbond)
   		os=
   		basic_machine=$1
   		;;
  +	-scout)
  +		;;
  +	-wrs)
  +		os=-vxworks
  +		basic_machine=$1
  +		;;
  +	-chorusos*)
  +		os=-chorusos
  +		basic_machine=$1
  +		;;
  + 	-chorusrdb)
  + 		os=-chorusrdb
  +		basic_machine=$1
  + 		;;
   	-hiux*)
   		os=-hiuxwe2
   		;;
   	-sco5)
  -		os=sco3.2v5
  +		os=-sco3.2v5
   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   		;;
   	-sco4)
  @@ -121,6 +189,9 @@
   		os=-sco3.2v2
   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   		;;
  +	-udk*)
  +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  +		;;
   	-isc)
   		os=-isc2.2
   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  @@ -143,25 +214,60 @@
   	-psos*)
   		os=-psos
   		;;
  +	-mint | -mint[0-9]*)
  +		basic_machine=m68k-atari
  +		os=-mint
  +		;;
   esac
   
   # Decode aliases for certain CPU-COMPANY combinations.
   case $basic_machine in
   	# Recognize the basic CPU types without company name.
   	# Some are omitted here because they have special meanings below.
  -	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
  -		| arme[lb] | pyramid \
  -		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
  -		| alpha | we32k | ns16k | clipper | i370 | sh \
  -		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
  -		| pdp11 | mips64el | mips64orion | mips64orionel \
  -		| sparc | sparclet | sparclite | sparc64)
  +	1750a | 580 \
  +	| a29k \
  +	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
  +	| c4x | clipper \
  +	| d10v | d30v | dsp16xx \
  +	| fr30 \
  +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  +	| i370 | i860 | i960 | ia64 \
  +	| m32r | m68000 | m68k | m88k | mcore \
  +	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
  +	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
  +	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
  +	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
  +	| mipsisa32 \
  +	| mn10200 | mn10300 \
  +	| ns16k | ns32k \
  +	| openrisc \
  +	| pdp10 | pdp11 | pj | pjl \
  +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  +	| pyramid \
  +	| sh | sh[34] | sh[34]eb | shbe | shle \
  +	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
  +	| strongarm \
  +	| tahoe | thumb | tic80 | tron \
  +	| v850 | v850e \
  +	| we32k \
  +	| x86 | xscale | xstormy16 | xtensa \
  +	| z8k)
   		basic_machine=$basic_machine-unknown
   		;;
  +	m6811 | m68hc11 | m6812 | m68hc12)
  +		# Motorola 68HC11/12.
  +		basic_machine=$basic_machine-unknown
  +		os=-none
  +		;;
  +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
  +		;;
  +
   	# We use `pc' rather than `unknown'
   	# because (1) that's what they normally are, and
   	# (2) the word "unknown" tends to confuse beginning users.
  -	i[3456]86)
  +	i*86 | x86_64)
   	  basic_machine=$basic_machine-pc
   	  ;;
   	# Object if more than one company name word.
  @@ -170,23 +276,66 @@
   		exit 1
   		;;
   	# Recognize the basic CPU types with company name.
  -	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
  -	      | sparc-* | ns32k-* | fx80-* | arm* | c[123]* \
  -	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
  -	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
  -	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
  -	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
  -	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
  -	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
  +	580-* \
  +	| a29k-* \
  +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
  +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  +	| arm-*  | armbe-* | armle-* | armv*-* \
  +	| avr-* \
  +	| bs2000-* \
  +	| c[123]* | c30-* | [cjt]90-* | c54x-* \
  +	| clipper-* | cray2-* | cydra-* \
  +	| d10v-* | d30v-* \
  +	| elxsi-* \
  +	| f30[01]-* | f700-* | fr30-* | fx80-* \
  +	| h8300-* | h8500-* \
  +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  +	| i*86-* | i860-* | i960-* | ia64-* \
  +	| m32r-* \
  +	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
  +	| m88110-* | m88k-* | mcore-* \
  +	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
  +	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
  +	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
  +	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
  +	| none-* | np1-* | ns16k-* | ns32k-* \
  +	| orion-* \
  +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  +	| pyramid-* \
  +	| romp-* | rs6000-* \
  +	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
  +	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
  +	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
  +	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
  +	| v850-* | v850e-* | vax-* \
  +	| we32k-* \
  +	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
  +	| xtensa-* \
  +	| ymp-* \
  +	| z8k-*)
   		;;
   	# Recognize the various machine names and aliases which stand
   	# for a CPU type and a company and sometimes even an OS.
  +	386bsd)
  +		basic_machine=i386-unknown
  +		os=-bsd
  +		;;
   	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
   		basic_machine=m68000-att
   		;;
   	3b*)
   		basic_machine=we32k-att
   		;;
  +	a29khif)
  +		basic_machine=a29k-amd
  +		os=-udi
  +		;;
  +	adobe68k)
  +		basic_machine=m68010-adobe
  +		os=-scout
  +		;;
   	alliant | fx80)
   		basic_machine=fx80-alliant
   		;;
  @@ -202,20 +351,24 @@
   		os=-sysv
   		;;
   	amiga | amiga-*)
  -		basic_machine=m68k-cbm
  +		basic_machine=m68k-unknown
   		;;
  -	amigados)
  -		basic_machine=m68k-cbm
  -		os=-amigados
  +	amigaos | amigados)
  +		basic_machine=m68k-unknown
  +		os=-amigaos
   		;;
   	amigaunix | amix)
  -		basic_machine=m68k-cbm
  +		basic_machine=m68k-unknown
   		os=-sysv4
   		;;
   	apollo68)
   		basic_machine=m68k-apollo
   		os=-sysv
   		;;
  +	apollo68bsd)
  +		basic_machine=m68k-apollo
  +		os=-bsd
  +		;;
   	aux)
   		basic_machine=m68k-apple
   		os=-aux
  @@ -252,19 +405,30 @@
   		basic_machine=cray2-cray
   		os=-unicos
   		;;
  -	[ctj]90-cray)
  -		basic_machine=c90-cray
  +	[cjt]90)
  +		basic_machine=${basic_machine}-cray
   		os=-unicos
   		;;
   	crds | unos)
   		basic_machine=m68k-crds
   		;;
  +	cris | cris-* | etrax*)
  +		basic_machine=cris-axis
  +		;;
   	da30 | da30-*)
   		basic_machine=m68k-da30
   		;;
   	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
   		basic_machine=mips-dec
   		;;
  +	decsystem10* | dec10*)
  +		basic_machine=pdp10-dec
  +		os=-tops10
  +		;;
  +	decsystem20* | dec20*)
  +		basic_machine=pdp10-dec
  +		os=-tops20
  +		;;
   	delta | 3300 | motorola-3300 | motorola-delta \
   	      | 3300-motorola | delta-motorola)
   		basic_machine=m68k-motorola
  @@ -292,6 +456,10 @@
   	encore | umax | mmax)
   		basic_machine=ns32k-encore
   		;;
  +	es1800 | OSE68k | ose68k | ose | OSE)
  +		basic_machine=m68k-ericsson
  +		os=-ose
  +		;;
   	fx2800)
   		basic_machine=i860-alliant
   		;;
  @@ -302,6 +470,10 @@
   		basic_machine=tron-gmicro
   		os=-sysv
   		;;
  +	go32)
  +		basic_machine=i386-pc
  +		os=-go32
  +		;;
   	h3050r* | hiux*)
   		basic_machine=hppa1.1-hitachi
   		os=-hiuxwe2
  @@ -310,6 +482,14 @@
   		basic_machine=h8300-hitachi
   		os=-hms
   		;;
  +	h8300xray)
  +		basic_machine=h8300-hitachi
  +		os=-xray
  +		;;
  +	h8500hms)
  +		basic_machine=h8500-hitachi
  +		os=-hms
  +		;;
   	harris)
   		basic_machine=m88k-harris
   		os=-sysv3
  @@ -325,13 +505,30 @@
   		basic_machine=m68k-hp
   		os=-hpux
   		;;
  +	hp3k9[0-9][0-9] | hp9[0-9][0-9])
  +		basic_machine=hppa1.0-hp
  +		;;
   	hp9k2[0-9][0-9] | hp9k31[0-9])
   		basic_machine=m68000-hp
   		;;
   	hp9k3[2-9][0-9])
   		basic_machine=m68k-hp
   		;;
  -	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
  +	hp9k6[0-9][0-9] | hp6[0-9][0-9])
  +		basic_machine=hppa1.0-hp
  +		;;
  +	hp9k7[0-79][0-9] | hp7[0-79][0-9])
  +		basic_machine=hppa1.1-hp
  +		;;
  +	hp9k78[0-9] | hp78[0-9])
  +		# FIXME: really hppa2.0-hp
  +		basic_machine=hppa1.1-hp
  +		;;
  +	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
  +		# FIXME: really hppa2.0-hp
  +		basic_machine=hppa1.1-hp
  +		;;
  +	hp9k8[0-9][13679] | hp8[0-9][13679])
   		basic_machine=hppa1.1-hp
   		;;
   	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  @@ -340,27 +537,42 @@
   	hppa-next)
   		os=-nextstep3
   		;;
  +	hppaosf)
  +		basic_machine=hppa1.1-hp
  +		os=-osf
  +		;;
  +	hppro)
  +		basic_machine=hppa1.1-hp
  +		os=-proelf
  +		;;
   	i370-ibm* | ibm*)
   		basic_machine=i370-ibm
  -		os=-mvs
   		;;
   # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
  -	i[3456]86v32)
  +	i*86v32)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv32
   		;;
  -	i[3456]86v4*)
  +	i*86v4*)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv4
   		;;
  -	i[3456]86v)
  +	i*86v)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv
   		;;
  -	i[3456]86sol2)
  +	i*86sol2)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-solaris2
   		;;
  +	i386mach)
  +		basic_machine=i386-mach
  +		os=-mach
  +		;;
  +	i386-vsta | vsta)
  +		basic_machine=i386-unknown
  +		os=-vsta
  +		;;
   	iris | iris4d)
   		basic_machine=mips-sgi
   		case $os in
  @@ -386,19 +598,63 @@
   		basic_machine=ns32k-utek
   		os=-sysv
   		;;
  +	mingw32)
  +		basic_machine=i386-pc
  +		os=-mingw32
  +		;;
   	miniframe)
   		basic_machine=m68000-convergent
   		;;
  +	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
  +		basic_machine=m68k-atari
  +		os=-mint
  +		;;
  +	mipsel*-linux*)
  +		basic_machine=mipsel-unknown
  +		os=-linux-gnu
  +		;;
  +	mips*-linux*)
  +		basic_machine=mips-unknown
  +		os=-linux-gnu
  +		;;
   	mips3*-*)
   		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
   		;;
   	mips3*)
   		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   		;;
  +	mmix*)
  +		basic_machine=mmix-knuth
  +		os=-mmixware
  +		;;
  +	monitor)
  +		basic_machine=m68k-rom68k
  +		os=-coff
  +		;;
  +	morphos)
  +		basic_machine=powerpc-unknown
  +		os=-morphos
  +		;;
  +	msdos)
  +		basic_machine=i386-pc
  +		os=-msdos
  +		;;
  +	mvs)
  +		basic_machine=i370-ibm
  +		os=-mvs
  +		;;
   	ncr3000)
   		basic_machine=i486-ncr
   		os=-sysv4
   		;;
  +	netbsd386)
  +		basic_machine=i386-unknown
  +		os=-netbsd
  +		;;
  +	netwinder)
  +		basic_machine=armv4l-rebel
  +		os=-linux
  +		;;
   	news | news700 | news800 | news900)
   		basic_machine=m68k-sony
   		os=-newsos
  @@ -411,6 +667,10 @@
   		basic_machine=mips-sony
   		os=-newsos
   		;;
  +	necv70)
  +		basic_machine=v70-nec
  +		os=-sysv
  +		;;
   	next | m*-next )
   		basic_machine=m68k-next
   		case $os in
  @@ -436,9 +696,32 @@
   		basic_machine=i960-intel
   		os=-nindy
   		;;
  +	mon960)
  +		basic_machine=i960-intel
  +		os=-mon960
  +		;;
  +	nonstopux)
  +		basic_machine=mips-compaq
  +		os=-nonstopux
  +		;;
   	np1)
   		basic_machine=np1-gould
   		;;
  +	nsr-tandem)
  +		basic_machine=nsr-tandem
  +		;;
  +	op50n-* | op60c-*)
  +		basic_machine=hppa1.1-oki
  +		os=-proelf
  +		;;
  +	OSE68000 | ose68000)
  +		basic_machine=m68000-ericsson
  +		os=-ose
  +		;;
  +	os68k)
  +		basic_machine=m68k-none
  +		os=-os68k
  +		;;
   	pa-hitachi)
   		basic_machine=hppa1.1-hitachi
   		os=-hiuxwe2
  @@ -456,30 +739,28 @@
           pc532 | pc532-*)
   		basic_machine=ns32k-pc532
   		;;
  -	pentium | p5)
  -		basic_machine=i586-intel
  +	pentium | p5 | k5 | k6 | nexgen | viac3)
  +		basic_machine=i586-pc
  +		;;
  +	pentiumpro | p6 | 6x86 | athlon)
  +		basic_machine=i686-pc
   		;;
  -	pentiumpro | p6)
  -		basic_machine=i686-intel
  +	pentiumii | pentium2)
  +		basic_machine=i686-pc
   		;;
  -	pentium-* | p5-*)
  +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
   		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  -	pentiumpro-* | p6-*)
  +	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  -	k5)
  -		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
  -		basic_machine=i586-amd
  -		;;
  -	nexen)
  -		# We don't have specific support for Nexgen yet, so just call it a Pentium
  -		basic_machine=i586-nexgen
  +	pentiumii-* | pentium2-*)
  +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
   	pn)
   		basic_machine=pn-gould
   		;;
  -	power)	basic_machine=rs6000-ibm
  +	power)	basic_machine=power-ibm
   		;;
   	ppc)	basic_machine=powerpc-unknown
   	        ;;
  @@ -491,15 +772,43 @@
   	ppcle-* | powerpclittle-*)
   		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  +	ppc64)	basic_machine=powerpc64-unknown
  +	        ;;
  +	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
  +		;;
  +	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
  +		basic_machine=powerpc64le-unknown
  +	        ;;
  +	ppc64le-* | powerpc64little-*)
  +		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
  +		;;
   	ps2)
   		basic_machine=i386-ibm
   		;;
  +	pw32)
  +		basic_machine=i586-unknown
  +		os=-pw32
  +		;;
  +	rom68k)
  +		basic_machine=m68k-rom68k
  +		os=-coff
  +		;;
   	rm[46]00)
   		basic_machine=mips-siemens
   		;;
   	rtpc | rtpc-*)
   		basic_machine=romp-ibm
   		;;
  +	s390 | s390-*)
  +		basic_machine=s390-ibm
  +		;;
  +	s390x | s390x-*)
  +		basic_machine=s390x-ibm
  +		;;
  +	sa29200)
  +		basic_machine=a29k-amd
  +		os=-udi
  +		;;
   	sequent)
   		basic_machine=i386-sequent
   		;;
  @@ -507,6 +816,10 @@
   		basic_machine=sh-hitachi
   		os=-hms
   		;;
  +	sparclite-wrs | simso-wrs)
  +		basic_machine=sparclite-wrs
  +		os=-vxworks
  +		;;
   	sps7)
   		basic_machine=m68k-bull
   		os=-sysv2
  @@ -514,6 +827,13 @@
   	spur)
   		basic_machine=spur-unknown
   		;;
  +	st2000)
  +		basic_machine=m68k-tandem
  +		;;
  +	stratus)
  +		basic_machine=i860-stratus
  +		os=-sysv4
  +		;;
   	sun2)
   		basic_machine=m68000-sun
   		;;
  @@ -554,10 +874,32 @@
   	sun386 | sun386i | roadrunner)
   		basic_machine=i386-sun
   		;;
  +	sv1)
  +		basic_machine=sv1-cray
  +		os=-unicos
  +		;;
   	symmetry)
   		basic_machine=i386-sequent
   		os=-dynix
   		;;
  +	t3e)
  +		basic_machine=t3e-cray
  +		os=-unicos
  +		;;
  +	tic54x | c54x*)
  +		basic_machine=tic54x-unknown
  +		os=-coff
  +		;;
  +	tx39)
  +		basic_machine=mipstx39-unknown
  +		;;
  +	tx39el)
  +		basic_machine=mipstx39el-unknown
  +		;;
  +	toad1)
  +		basic_machine=pdp10-xkl
  +		os=-tops20
  +		;;
   	tower | tower-32)
   		basic_machine=m68k-ncr
   		;;
  @@ -569,6 +911,10 @@
   		basic_machine=a29k-nyu
   		os=-sym1
   		;;
  +	v810 | necv810)
  +		basic_machine=v810-nec
  +		os=-none
  +		;;
   	vaxv)
   		basic_machine=vax-dec
   		os=-sysv
  @@ -577,7 +923,7 @@
   		basic_machine=vax-dec
   		os=-vms
   		;;
  -       vpp*|vx|vx-*)
  +	vpp*|vx|vx-*)
                  basic_machine=f301-fujitsu
                  ;;
   	vxworks960)
  @@ -592,6 +938,18 @@
   		basic_machine=a29k-wrs
   		os=-vxworks
   		;;
  +	w65*)
  +		basic_machine=w65-wdc
  +		os=-none
  +		;;
  +	w89k-*)
  +		basic_machine=hppa1.1-winbond
  +		os=-proelf
  +		;;
  +	windows32)
  +		basic_machine=i386-pc
  +		os=-windows32-msvcrt
  +		;;
   	xmp)
   		basic_machine=xmp-cray
   		os=-unicos
  @@ -599,6 +957,10 @@
           xps | xps100)
   		basic_machine=xps100-honeywell
   		;;
  +	z8k-*-coff)
  +		basic_machine=z8k-unknown
  +		os=-sim
  +		;;
   	none)
   		basic_machine=none-none
   		os=-none
  @@ -606,8 +968,21 @@
   
   # Here we handle the default manufacturer of certain CPU types.  It is in
   # some cases the only manufacturer, in others, it is the most popular.
  +	w89k)
  +		basic_machine=hppa1.1-winbond
  +		;;
  +	op50n)
  +		basic_machine=hppa1.1-oki
  +		;;
  +	op60c)
  +		basic_machine=hppa1.1-oki
  +		;;
   	mips)
  -		basic_machine=mips-mips
  +		if [ x$os = x-linux-gnu ]; then
  +			basic_machine=mips-unknown
  +		else
  +			basic_machine=mips-mips
  +		fi
   		;;
   	romp)
   		basic_machine=romp-ibm
  @@ -618,13 +993,20 @@
   	vax)
   		basic_machine=vax-dec
   		;;
  +	pdp10)
  +		# there are many clones, so DEC is not a safe bet
  +		basic_machine=pdp10-unknown
  +		;;
   	pdp11)
   		basic_machine=pdp11-dec
   		;;
   	we32k)
   		basic_machine=we32k-att
   		;;
  -	sparc)
  +	sh3 | sh4 | sh3eb | sh4eb)
  +		basic_machine=sh-unknown
  +		;;
  +	sparc | sparcv9 | sparcv9b)
   		basic_machine=sparc-sun
   		;;
           cydra)
  @@ -636,6 +1018,19 @@
   	orion105)
   		basic_machine=clipper-highlevel
   		;;
  +	mac | mpw | mac-mpw)
  +		basic_machine=m68k-apple
  +		;;
  +	pmac | pmac-mpw)
  +		basic_machine=powerpc-apple
  +		;;
  +	c4x*)
  +		basic_machine=c4x-none
  +		os=-coff
  +		;;
  +	*-unknown)
  +		# Make sure to match an already-canonicalized machine name.
  +		;;
   	*)
   		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   		exit 1
  @@ -668,9 +1063,12 @@
   	-solaris)
   		os=-solaris2
   		;;
  -	-unixware* | svr4*)
  +	-svr4*)
   		os=-sysv4
   		;;
  +	-unixware*)
  +		os=-sysv4.2uw
  +		;;
   	-gnu/linux*)
   		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
   		;;
  @@ -681,17 +1079,42 @@
   	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
   	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
   	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
  -	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
  +	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  +	      | -aos* \
   	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
   	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
   	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
  -	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
  +	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
   	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
   	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  -	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  -	      | -linux-gnu* | -uxpv*)
  +	      | -chorusos* | -chorusrdb* \
  +	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  +	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
  +	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
  +	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
   	# Remember, each alternative MUST END IN *, to match a version number.
   		;;
  +	-qnx*)
  +		case $basic_machine in
  +		    x86-* | i*86-*)
  +			;;
  +		    *)
  +			os=-nto$os
  +			;;
  +		esac
  +		;;
  +	-nto*)
  +		os=-nto-qnx
  +		;;
  +	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  +	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
  +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  +		;;
  +	-mac*)
  +		os=`echo $os | sed -e 's|mac|macos|'`
  +		;;
   	-linux*)
   		os=`echo $os | sed -e 's|linux|linux-gnu|'`
   		;;
  @@ -701,6 +1124,12 @@
   	-sunos6*)
   		os=`echo $os | sed -e 's|sunos6|solaris3|'`
   		;;
  +	-opened*)
  +		os=-openedition
  +		;;
  +	-wince*)
  +		os=-wince
  +		;;
   	-osfrose*)
   		os=-osfrose
   		;;
  @@ -716,12 +1145,21 @@
   	-acis*)
   		os=-aos
   		;;
  +	-atheos*)
  +		os=-atheos
  +		;;
  +	-386bsd)
  +		os=-bsd
  +		;;
   	-ctix* | -uts*)
   		os=-sysv
   		;;
   	-ns2 )
   	        os=-nextstep2
   		;;
  +	-nsk*)
  +		os=-nsk
  +		;;
   	# Preserve the version number of sinix5.
   	-sinix5.*)
   		os=`echo $os | sed -e 's|sinix|sysv|'`
  @@ -747,9 +1185,18 @@
   	# This must come after -sysvr4.
   	-sysv*)
   		;;
  +	-ose*)
  +		os=-ose
  +		;;
  +	-es1800*)
  +		os=-ose
  +		;;
   	-xenix)
   		os=-xenix
   		;;
  +        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  +	        os=-mint
  +		;;
   	-none)
   		;;
   	*)
  @@ -775,9 +1222,16 @@
   	*-acorn)
   		os=-riscix1.2
   		;;
  +	arm*-rebel)
  +		os=-linux
  +		;;
   	arm*-semi)
   		os=-aout
   		;;
  +	# This must come before the *-dec entry.
  +	pdp10-*)
  +		os=-tops20
  +		;;
           pdp11-*)
   		os=-none
   		;;
  @@ -796,15 +1250,36 @@
   		# default.
   		# os=-sunos4
   		;;
  +	m68*-cisco)
  +		os=-aout
  +		;;
  +	mips*-cisco)
  +		os=-elf
  +		;;
  +	mips*-*)
  +		os=-elf
  +		;;
   	*-tti)	# must be before sparc entry or we get the wrong os.
   		os=-sysv3
   		;;
   	sparc-* | *-sun)
   		os=-sunos4.1.1
   		;;
  +	*-be)
  +		os=-beos
  +		;;
   	*-ibm)
   		os=-aix
   		;;
  +	*-wec)
  +		os=-proelf
  +		;;
  +	*-winbond)
  +		os=-proelf
  +		;;
  +	*-oki)
  +		os=-proelf
  +		;;
   	*-hp)
   		os=-hpux
   		;;
  @@ -815,7 +1290,7 @@
   		os=-sysv
   		;;
   	*-cbm)
  -		os=-amigados
  +		os=-amigaos
   		;;
   	*-dg)
   		os=-dgux
  @@ -865,9 +1340,21 @@
   	*-masscomp)
   		os=-rtu
   		;;
  -	f301-fujitsu)
  +	f30[01]-fujitsu | f700-fujitsu)
   		os=-uxpv
   		;;
  +	*-rom68k)
  +		os=-coff
  +		;;
  +	*-*bug)
  +		os=-coff
  +		;;
  +	*-apple)
  +		os=-macos
  +		;;
  +	*-atari*)
  +		os=-mint
  +		;;
   	*)
   		os=-none
   		;;
  @@ -889,9 +1376,15 @@
   			-aix*)
   				vendor=ibm
   				;;
  +			-beos*)
  +				vendor=be
  +				;;
   			-hpux*)
   				vendor=hp
   				;;
  +			-mpeix*)
  +				vendor=hp
  +				;;
   			-hiux*)
   				vendor=hitachi
   				;;
  @@ -907,7 +1400,7 @@
   			-genix*)
   				vendor=ns
   				;;
  -			-mvs*)
  +			-mvs* | -opened*)
   				vendor=ibm
   				;;
   			-ptx*)
  @@ -919,9 +1412,29 @@
   			-aux*)
   				vendor=apple
   				;;
  +			-hms*)
  +				vendor=hitachi
  +				;;
  +			-mpw* | -macos*)
  +				vendor=apple
  +				;;
  +			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  +				vendor=atari
  +				;;
  +			-vos*)
  +				vendor=stratus
  +				;;
   		esac
   		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
   		;;
   esac
   
   echo $basic_machine$os
  +exit 0
  +
  +# Local variables:
  +# eval: (add-hook 'write-file-hooks 'time-stamp)
  +# time-stamp-start: "timestamp='"
  +# time-stamp-format: "%:y-%02m-%02d"
  +# time-stamp-end: "'"
  +# End:
  diff -Naur Libnet-1.0.2a.orig/configure Libnet-1.0.2a/configure
  --- Libnet-1.0.2a.orig/configure	2001-01-17 20:59:33.000000000 +0000
  +++ Libnet-1.0.2a/configure	2003-09-18 05:34:51.000000000 +0000
  @@ -658,10 +658,14 @@
       prefix="/usr"
   fi
   
  +if test "$mandir" = "NONE"; then
  +    mandir="$prefix/man"
  +fi
  +
   # Extract the first word of "gcc", so it can be a program name with args.
   set dummy gcc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:665: checking for $ac_word" >&5
  +echo "configure:669: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -691,7 +695,7 @@
     # Extract the first word of "cc", so it can be a program name with args.
   set dummy cc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:695: checking for $ac_word" >&5
  +echo "configure:699: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -742,7 +746,7 @@
         # Extract the first word of "cl", so it can be a program name with args.
   set dummy cl; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:746: checking for $ac_word" >&5
  +echo "configure:750: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -774,7 +778,7 @@
   fi
   
   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
  -echo "configure:778: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  +echo "configure:782: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
   
   ac_ext=c
   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  @@ -785,12 +789,12 @@
   
   cat > conftest.$ac_ext << EOF
   
  -#line 789 "configure"
  +#line 793 "configure"
   #include "confdefs.h"
   
   main(){return(0);}
   EOF
  -if { (eval echo configure:794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     ac_cv_prog_cc_works=yes
     # If we can't run a trivial program, we are probably using a cross compiler.
     if (./conftest; exit) 2>/dev/null; then
  @@ -816,12 +820,12 @@
     { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
   fi
   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
  -echo "configure:820: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  +echo "configure:824: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   cross_compiling=$ac_cv_prog_cc_cross
   
   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
  -echo "configure:825: checking whether we are using GNU C" >&5
  +echo "configure:829: checking whether we are using GNU C" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -830,7 +834,7 @@
     yes;
   #endif
   EOF
  -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
  +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     ac_cv_prog_gcc=yes
   else
     ac_cv_prog_gcc=no
  @@ -849,7 +853,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
  -echo "configure:853: checking whether ${CC-cc} accepts -g" >&5
  +echo "configure:857: checking whether ${CC-cc} accepts -g" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -882,12 +886,12 @@
   
   
   echo $ac_n "checking for working const""... $ac_c" 1>&6
  -echo "configure:886: checking for working const" >&5
  +echo "configure:890: checking for working const" >&5
   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 891 "configure"
  +#line 895 "configure"
   #include "confdefs.h"
   
   int main() {
  @@ -936,7 +940,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  +if { (eval echo configure:944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     rm -rf conftest*
     ac_cv_c_const=yes
   else
  @@ -996,7 +1000,7 @@
   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
   # ./install, which can be erroneously created by make from ./install.sh.
   echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
  -echo "configure:1000: checking for a BSD compatible install" >&5
  +echo "configure:1004: checking for a BSD compatible install" >&5
   if test -z "$INSTALL"; then
   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -1049,7 +1053,7 @@
   test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
   
   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
  -echo "configure:1053: checking whether ${MAKE-make} sets \${MAKE}" >&5
  +echo "configure:1057: checking whether ${MAKE-make} sets \${MAKE}" >&5
   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -1080,7 +1084,7 @@
   # Extract the first word of "$ac_prog", so it can be a program name with args.
   set dummy $ac_prog; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:1084: checking for $ac_word" >&5
  +echo "configure:1088: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1115,7 +1119,7 @@
   # Extract the first word of "$ac_prog", so it can be a program name with args.
   set dummy $ac_prog; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:1119: checking for $ac_word" >&5
  +echo "configure:1123: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1150,7 +1154,7 @@
   # Extract the first word of "$ac_prog", so it can be a program name with args.
   set dummy $ac_prog; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:1154: checking for $ac_word" >&5
  +echo "configure:1158: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_LN'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1184,12 +1188,12 @@
   for ac_func in strerror
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1188: checking for $ac_func" >&5
  +echo "configure:1192: 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 1193 "configure"
  +#line 1197 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1212,7 +1216,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1220: \"$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
  @@ -1238,7 +1242,7 @@
   
   
   echo $ac_n "checking for pcap_open_live in -lpcap""... $ac_c" 1>&6
  -echo "configure:1242: checking for pcap_open_live in -lpcap" >&5
  +echo "configure:1246: checking for pcap_open_live in -lpcap" >&5
   ac_lib_var=`echo pcap'_'pcap_open_live | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -1246,7 +1250,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-lpcap  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1250 "configure"
  +#line 1254 "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
  @@ -1257,7 +1261,7 @@
   pcap_open_live()
   ; return 0; }
   EOF
  -if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1265: \"$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
  @@ -1282,7 +1286,7 @@
   
   
   echo $ac_n "checking low-level packet interface type""... $ac_c" 1>&6
  -echo "configure:1286: checking low-level packet interface type" >&5
  +echo "configure:1290: checking low-level packet interface type" >&5
   
   if test -r /dev/bpf0 ; then
       LL_INT_TYPE=bpf
  @@ -1312,7 +1316,7 @@
       if test $with_pf_packet = yes; then
            
       echo $ac_n "checking for PF_PACKET""... $ac_c" 1>&6
  -echo "configure:1316: checking for PF_PACKET" >&5
  +echo "configure:1320: checking for PF_PACKET" >&5
       if eval "test \"`echo '$''{'ac_libnet_have_pf_packet'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1451,7 +1455,7 @@
   
       LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
       echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
  -echo "configure:1455: checking how to run the C preprocessor" >&5
  +echo "configure:1459: checking how to run the C preprocessor" >&5
   # On Suns, sometimes $CPP names a directory.
   if test -n "$CPP" && test -d "$CPP"; then
     CPP=
  @@ -1466,13 +1470,13 @@
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp.
     cat > conftest.$ac_ext <<EOF
  -#line 1470 "configure"
  +#line 1474 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     :
  @@ -1483,13 +1487,13 @@
     rm -rf conftest*
     CPP="${CC-cc} -E -traditional-cpp"
     cat > conftest.$ac_ext <<EOF
  -#line 1487 "configure"
  +#line 1491 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     :
  @@ -1500,13 +1504,13 @@
     rm -rf conftest*
     CPP="${CC-cc} -nologo -E"
     cat > conftest.$ac_ext <<EOF
  -#line 1504 "configure"
  +#line 1508 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     :
  @@ -1534,17 +1538,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1538: checking for $ac_hdr" >&5
  +echo "configure:1542: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1543 "configure"
  +#line 1547 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1571,7 +1575,7 @@
   fi
   done
   
  -    MAN_PREFIX="$prefix/man/man3/"
  +    MAN_PREFIX="$mandir/man3/"
       LIB_PREFIX="$prefix/lib/"
       INC_PREFIX="$prefix/include/"
       BIN_PREFIX="$prefix/bin/"
  @@ -1661,17 +1665,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1665: checking for $ac_hdr" >&5
  +echo "configure:1669: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1670 "configure"
  +#line 1674 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1698,7 +1702,7 @@
   done
   
       echo $ac_n "checking for /dev/dlpi device""... $ac_c" 1>&6
  -echo "configure:1702: checking for /dev/dlpi device" >&5
  +echo "configure:1706: checking for /dev/dlpi device" >&5
       if test -c /dev/dlpi; then
           echo "$ac_t""yes" 1>&6
           cat >> confdefs.h <<\EOF
  @@ -1709,7 +1713,7 @@
           echo "$ac_t""no" 1>&6
           dir="/dev/dlpi"
           echo $ac_n "checking for $dir directory""... $ac_c" 1>&6
  -echo "configure:1713: checking for $dir directory" >&5
  +echo "configure:1717: checking for $dir directory" >&5
           if test -d $dir ; then
               echo "$ac_t""yes" 1>&6
               cat >> confdefs.h <<EOF
  @@ -1721,7 +1725,7 @@
           fi
       fi
       echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
  -echo "configure:1725: checking for socket in -lsocket" >&5
  +echo "configure:1729: 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
  @@ -1729,7 +1733,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-lsocket  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1733 "configure"
  +#line 1737 "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
  @@ -1740,7 +1744,7 @@
   socket()
   ; return 0; }
   EOF
  -if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1748: \"$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
  @@ -1769,7 +1773,7 @@
   fi
   
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
  -echo "configure:1773: checking for gethostbyname in -lnsl" >&5
  +echo "configure:1777: 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
  @@ -1777,7 +1781,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-lnsl  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1781 "configure"
  +#line 1785 "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
  @@ -1788,7 +1792,7 @@
   gethostbyname()
   ; return 0; }
   EOF
  -if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1796: \"$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
  @@ -1852,7 +1856,7 @@
   
   
       echo $ac_n "checking for libnet_build_ip in -lnet""... $ac_c" 1>&6
  -echo "configure:1856: checking for libnet_build_ip in -lnet" >&5
  +echo "configure:1860: checking for libnet_build_ip in -lnet" >&5
   ac_lib_var=`echo net'_'libnet_build_ip | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -1860,7 +1864,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-lnet  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1864 "configure"
  +#line 1868 "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
  @@ -1871,7 +1875,7 @@
   libnet_build_ip()
   ; return 0; }
   EOF
  -if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1879: \"$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
  @@ -1887,7 +1891,7 @@
   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
     echo "$ac_t""yes" 1>&6
     echo $ac_n "checking version""... $ac_c" 1>&6
  -echo "configure:1891: checking version" >&5 \
  +echo "configure:1895: checking version" >&5 \
   
       if [ ! -f $LIB_PREFIX/libnet.a ] ; then
           echo "$ac_t""$LIB_PREFIX/libnet.a doesn't exist" 1>&6
  @@ -1908,7 +1912,7 @@
   
   
   echo $ac_n "checking machine endianess""... $ac_c" 1>&6
  -echo "configure:1912: checking machine endianess" >&5
  +echo "configure:1916: checking machine endianess" >&5
   
       cat > conftest.c << EOF
   #       include <stdio.h>
  @@ -1978,7 +1982,7 @@
           fi
       
   echo $ac_n "checking if unaligned accesses fail""... $ac_c" 1>&6
  -echo "configure:1982: checking if unaligned accesses fail" >&5
  +echo "configure:1986: checking if unaligned accesses fail" >&5
       if eval "test \"`echo '$''{'ac_cv_lbl_unaligned_fail'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -2052,17 +2056,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2056: checking for $ac_hdr" >&5
  +echo "configure:2060: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2061 "configure"
  +#line 2065 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  diff -Naur Libnet-1.0.2a.orig/configure.in Libnet-1.0.2a/configure.in
  --- Libnet-1.0.2a.orig/configure.in	2001-01-17 20:59:30.000000000 +0000
  +++ Libnet-1.0.2a/configure.in	2003-09-18 05:34:51.000000000 +0000
  @@ -35,6 +35,10 @@
       prefix="/usr"
   fi
   
  +if test "$mandir" = "NONE"; then
  +    mandir="$prefix/man"
  +fi
  +
   dnl
   dnl Check compiler type.
   dnl
  @@ -147,7 +151,7 @@
       LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
       AC_CHECK_HEADERS(net/ethernet.h, \
           LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
  -    MAN_PREFIX="$prefix/man/man3/"
  +    MAN_PREFIX="$mandir/man3/"
       LIB_PREFIX="$prefix/lib/"
       INC_PREFIX="$prefix/include/"
       BIN_PREFIX="$prefix/bin/"
  diff -Naur Libnet-1.0.2a.orig/include/libnet.h Libnet-1.0.2a/include/libnet.h
  --- Libnet-1.0.2a.orig/include/libnet.h	2001-02-06 23:19:25.000000000 +0000
  +++ Libnet-1.0.2a/include/libnet.h	2003-09-18 05:34:51.000000000 +0000
  @@ -84,8 +84,8 @@
   #define LIBNET_VERSION  "1.0.2a"
   
   #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
  -#error "byte order has not been specified, you'll
  -need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
  +#error "byte order has not been specified, you'll \
  +need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the \
   documentation regarding the libnet-config script."
   #endif
   
  diff -Naur Libnet-1.0.2a.orig/include/libnet.h~ Libnet-1.0.2a/include/libnet.h~
  --- Libnet-1.0.2a.orig/include/libnet.h~	1970-01-01 00:00:00.000000000 +0000
  +++ Libnet-1.0.2a/include/libnet.h~	2003-09-18 05:30:15.000000000 +0000
  @@ -0,0 +1,94 @@
  +/*
  + *  $Id: Libnet-1.0.2a-fixes-1.patch,v 1.1 2003/10/05 21:54:40 jim Exp $
  + *
  + *  libnet.h - Network routine library header file
  + *
  + *  Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
  + *  All rights reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in the
  + *    documentation and/or other materials provided with the distribution.
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  + * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + *
  + */
  +
  +#ifndef __LIBNET_H
  +#define __LIBNET_H
  +
  +#include <stdio.h>
  +#include <string.h>
  +#include <unistd.h>
  +#include <fcntl.h>
  +#include <signal.h>
  +#include <stdlib.h>
  +#include <sys/ioctl.h>
  +#if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFADDR)
  +#include <sys/sockio.h>
  +#endif
  +#include <sys/stat.h>
  +#include <sys/types.h>
  +#include <ctype.h>
  +#include <sys/socket.h>
  +#include <netinet/in.h>
  +#include <netinet/in_systm.h>
  +#include <netinet/ip.h>
  +#include <net/if.h>
  +#if !(__linux__)
  +#include <netinet/ip_var.h>
  +#else   /* __linux__ */
  +#if (HAVE_NET_ETHERNET_H)
  +#include <net/ethernet.h>
  +#endif  /* HAVE_NET_ETHERNET_H */
  +#endif  /* __linux__ */
  +#include <netinet/tcp.h>
  +#include <netinet/udp.h>
  +#include <netinet/ip_icmp.h>
  +#if (__linux__) && !(__GLIBC__)
  +/*
  + *  We get multiple definitions of IGMP_AGE_THRESHOLD if we include netinet.
  + */
  +#include <linux/igmp.h>
  +#else
  +#include <netinet/igmp.h>
  +#endif
  +#include <arpa/inet.h>
  +#include <sys/time.h>
  +#include <netdb.h>
  +#include <errno.h>
  +#include <assert.h>
  +
  +#include "./libnet/libnet-headers.h"
  +#include "./libnet/libnet-structures.h"
  +#include "./libnet/libnet-macros.h"
  +#include "./libnet/libnet-asn1.h"
  +#include "./libnet/libnet-functions.h"
  +#include "./libnet/libnet-ospf.h"
  +
  +#define LIBNET_VERSION  "1.0.2a"
  +
  +#if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
  +#error "byte order has not been specified, you'll \
  +need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the \
  +documentation regarding the libnet-config script."
  +#endif
  +
  +#endif  /* __LIBNET_H */
  +
  +/* EOF */
  diff -Naur Libnet-1.0.2a.orig/install-sh Libnet-1.0.2a/install-sh
  --- Libnet-1.0.2a.orig/install-sh	2001-02-05 17:51:48.000000000 +0000
  +++ Libnet-1.0.2a/install-sh	2003-09-18 05:34:51.000000000 +0000
  @@ -44,7 +44,7 @@
   transformbasename=""
   transform_arg=""
   instcmd="$cpprog"
  -chmodcmd="$chmodprog 0755"
  +chmodcmd=""
   chowncmd=""
   chgrpcmd=""
   stripcmd=""
  diff -Naur Libnet-1.0.2a.orig/src/libnet_prand.c Libnet-1.0.2a/src/libnet_prand.c
  --- Libnet-1.0.2a.orig/src/libnet_prand.c	2001-02-05 19:22:26.000000000 +0000
  +++ Libnet-1.0.2a/src/libnet_prand.c	2003-09-18 05:34:51.000000000 +0000
  @@ -30,6 +30,8 @@
    *
    */
    
  +#include <stdlib.h>
  +
   #if (HAVE_CONFIG_H)
   #include "../include/config.h"
   #endif
  
  
  



More information about the patches mailing list