Disabled /dev/event joystick interface by default
authorSam Lantinga <slouken@lokigames.com>
Sun, 10 Jun 2001 04:54:53 +0000
changeset 51fba28d77901f
parent 50 eda2f15ffb70
child 52 3f344be3301b
Disabled /dev/event joystick interface by default
configure.in
docs.html
test/config.guess
test/config.sub
test/configure.in
     1.1 --- a/configure.in	Thu Jun 07 15:04:04 2001 +0000
     1.2 +++ b/configure.in	Sun Jun 10 04:54:53 2001 +0000
     1.3 @@ -37,13 +37,13 @@
     1.4  AC_SUBST(LT_REVISION)
     1.5  AC_SUBST(LT_AGE)
     1.6  
     1.7 -dnl Setup for automake
     1.8 -AM_INIT_AUTOMAKE(SDL, $SDL_VERSION)
     1.9 -
    1.10  dnl Detect the canonical host and target build environment
    1.11  AC_CANONICAL_HOST
    1.12  AC_CANONICAL_TARGET
    1.13  
    1.14 +dnl Setup for automake
    1.15 +AM_INIT_AUTOMAKE(SDL, $SDL_VERSION)
    1.16 +
    1.17  dnl Check for tools
    1.18  
    1.19  AC_LIBTOOL_WIN32_DLL
    1.20 @@ -801,8 +801,8 @@
    1.21  {
    1.22      dnl Check for Linux 2.4 unified input event interface support
    1.23      AC_ARG_ENABLE(input-events,
    1.24 -[  --enable-input-events   use Linux 2.4 unified input interface [default=yes]],
    1.25 -                  , enable_input_events=yes)
    1.26 +[  --enable-input-events   use Linux 2.4 unified input interface [default=no]],
    1.27 +                  , enable_input_events=no)
    1.28      if test x$enable_input_events = xyes; then
    1.29          AC_MSG_CHECKING(for Linux 2.4 unified input interface)
    1.30          use_input_events=no
     2.1 --- a/docs.html	Thu Jun 07 15:04:04 2001 +0000
     2.2 +++ b/docs.html	Sun Jun 10 04:54:53 2001 +0000
     2.3 @@ -16,6 +16,7 @@
     2.4  Major changes since SDL 1.0.0:
     2.5  </H2>
     2.6  <UL>
     2.7 +	<LI> 1.2.1: Disabled /dev/event joystick interface by default
     2.8  	<LI> 1.2.1: Added initial support for Quartz video (thanks Darrell!)
     2.9  	<LI> 1.2.1: Added native OpenBSD audio driver (thanks vedge!)
    2.10  	<LI> 1.2.1: Added detection of Open Sound System on Solaris x86
     3.1 --- a/test/config.guess	Thu Jun 07 15:04:04 2001 +0000
     3.2 +++ b/test/config.guess	Sun Jun 10 04:54:53 2001 +0000
     3.3 @@ -1,10 +1,8 @@
     3.4  #! /bin/sh
     3.5  # Attempt to guess a canonical system name.
     3.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
     3.7 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
     3.8  #   Free Software Foundation, Inc.
     3.9 -
    3.10 -version='2000-09-05'
    3.11 -
    3.12 +#
    3.13  # This file is free software; you can redistribute it and/or modify it
    3.14  # under the terms of the GNU General Public License as published by
    3.15  # the Free Software Foundation; either version 2 of the License, or
    3.16 @@ -25,7 +23,8 @@
    3.17  # the same distribution terms that you use for the rest of that program.
    3.18  
    3.19  # Written by Per Bothner <bothner@cygnus.com>.
    3.20 -# Please send patches to <config-patches@gnu.org>.
    3.21 +# The master version of this file is at the FSF in /home/gd/gnu/lib.
    3.22 +# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
    3.23  #
    3.24  # This script attempts to guess a canonical system name similar to
    3.25  # config.sub.  If it succeeds, it prints the system name on stdout, and
    3.26 @@ -38,46 +37,6 @@
    3.27  # (but try to keep the structure clean).
    3.28  #
    3.29  
    3.30 -me=`echo "$0" | sed -e 's,.*/,,'`
    3.31 -
    3.32 -usage="\
    3.33 -Usage: $0 [OPTION]
    3.34 -
    3.35 -Output the configuration name of this system.
    3.36 -
    3.37 -Operation modes:
    3.38 -  -h, --help               print this help, then exit
    3.39 -  -V, --version            print version number, then exit"
    3.40 -
    3.41 -help="
    3.42 -Try \`$me --help' for more information."
    3.43 -
    3.44 -# Parse command line
    3.45 -while test $# -gt 0 ; do
    3.46 -  case "$1" in
    3.47 -    --version | --vers* | -V )
    3.48 -       echo "$version" ; exit 0 ;;
    3.49 -    --help | --h* | -h )
    3.50 -       echo "$usage"; exit 0 ;;
    3.51 -    -- )     # Stop option processing
    3.52 -       shift; break ;;
    3.53 -    - )	# Use stdin as input.
    3.54 -       break ;;
    3.55 -    -* )
    3.56 -       exec >&2
    3.57 -       echo "$me: invalid option $1"
    3.58 -       echo "$help"
    3.59 -       exit 1 ;;
    3.60 -    * )
    3.61 -       break ;;
    3.62 -  esac
    3.63 -done
    3.64 -
    3.65 -if test $# != 0; then
    3.66 -  echo "$me: too many arguments$help" >&2
    3.67 -  exit 1
    3.68 -fi
    3.69 -
    3.70  # Use $HOST_CC if defined. $CC may point to a cross-compiler
    3.71  if test x"$CC_FOR_BUILD" = x; then
    3.72    if test x"$HOST_CC" != x; then
    3.73 @@ -109,43 +68,6 @@
    3.74  # Note: order is significant - the case branches are not exclusive.
    3.75  
    3.76  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    3.77 -    *:NetBSD:*:*)
    3.78 -	# Netbsd (nbsd) targets should (where applicable) match one or
    3.79 -	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
    3.80 -	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
    3.81 -	# switched to ELF, *-*-netbsd* would select the old
    3.82 -	# object file format.  This provides both forward
    3.83 -	# compatibility and a consistent mechanism for selecting the
    3.84 -	# object file format.
    3.85 -	# Determine the machine/vendor (is the vendor relevant).
    3.86 -	case "${UNAME_MACHINE}" in
    3.87 -	    amiga) machine=m68k-unknown ;;
    3.88 -	    arm32) machine=arm-unknown ;;
    3.89 -	    atari*) machine=m68k-atari ;;
    3.90 -	    sun3*) machine=m68k-sun ;;
    3.91 -	    mac68k) machine=m68k-apple ;;
    3.92 -	    macppc) machine=powerpc-apple ;;
    3.93 -	    hp3[0-9][05]) machine=m68k-hp ;;
    3.94 -	    ibmrt|romp-ibm) machine=romp-ibm ;;
    3.95 -	    *) machine=${UNAME_MACHINE}-unknown ;;
    3.96 -	esac
    3.97 -	# The Operating System including object format.
    3.98 -	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
    3.99 -		| grep __ELF__ >/dev/null
   3.100 -	then
   3.101 -	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
   3.102 -	    # Return netbsd for either.  FIX?
   3.103 -	    os=netbsd
   3.104 -	else
   3.105 -	    os=netbsdelf
   3.106 -	fi
   3.107 -	# The OS release
   3.108 -	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   3.109 -	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
   3.110 -	# contains redundant information, the shorter form:
   3.111 -	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   3.112 -	echo "${machine}-${os}${release}"
   3.113 -	exit 0 ;;
   3.114      alpha:OSF1:*:*)
   3.115  	if test $UNAME_RELEASE = "V4.0"; then
   3.116  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
   3.117 @@ -155,51 +77,41 @@
   3.118  	# A Xn.n version is an unreleased experimental baselevel.
   3.119  	# 1.2 uses "1.2" for uname -r.
   3.120  	cat <<EOF >$dummy.s
   3.121 -	.data
   3.122 -\$Lformat:
   3.123 -	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
   3.124 -
   3.125 -	.text
   3.126  	.globl main
   3.127 -	.align 4
   3.128  	.ent main
   3.129  main:
   3.130 -	.frame \$30,16,\$26,0
   3.131 -	ldgp \$29,0(\$27)
   3.132 -	.prologue 1
   3.133 -	.long 0x47e03d80 # implver \$0
   3.134 -	lda \$2,-1
   3.135 -	.long 0x47e20c21 # amask \$2,\$1
   3.136 -	lda \$16,\$Lformat
   3.137 -	mov \$0,\$17
   3.138 -	not \$1,\$18
   3.139 -	jsr \$26,printf
   3.140 -	ldgp \$29,0(\$26)
   3.141 -	mov 0,\$16
   3.142 -	jsr \$26,exit
   3.143 +	.frame \$30,0,\$26,0
   3.144 +	.prologue 0
   3.145 +	.long 0x47e03d80 # implver $0
   3.146 +	lda \$2,259
   3.147 +	.long 0x47e20c21 # amask $2,$1
   3.148 +	srl \$1,8,\$2
   3.149 +	sll \$2,2,\$2
   3.150 +	sll \$0,3,\$0
   3.151 +	addl \$1,\$0,\$0
   3.152 +	addl \$2,\$0,\$0
   3.153 +	ret \$31,(\$26),1
   3.154  	.end main
   3.155  EOF
   3.156  	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   3.157  	if test "$?" = 0 ; then
   3.158 -		case `./$dummy` in
   3.159 -			0-0)
   3.160 +		./$dummy
   3.161 +		case "$?" in
   3.162 +			7)
   3.163  				UNAME_MACHINE="alpha"
   3.164  				;;
   3.165 -			1-0)
   3.166 +			15)
   3.167  				UNAME_MACHINE="alphaev5"
   3.168  				;;
   3.169 -			1-1)
   3.170 +			14)
   3.171  				UNAME_MACHINE="alphaev56"
   3.172  				;;
   3.173 -			1-101)
   3.174 +			10)
   3.175  				UNAME_MACHINE="alphapca56"
   3.176  				;;
   3.177 -			2-303)
   3.178 +			16)
   3.179  				UNAME_MACHINE="alphaev6"
   3.180  				;;
   3.181 -			2-307)
   3.182 -				UNAME_MACHINE="alphaev67"
   3.183 -				;;
   3.184  		esac
   3.185  	fi
   3.186  	rm -f $dummy.s $dummy
   3.187 @@ -215,8 +127,11 @@
   3.188  	echo alpha-dec-winnt3.5
   3.189  	exit 0 ;;
   3.190      Amiga*:UNIX_System_V:4.0:*)
   3.191 -	echo m68k-unknown-sysv4
   3.192 +	echo m68k-cbm-sysv4
   3.193  	exit 0;;
   3.194 +    amiga:NetBSD:*:*)
   3.195 +      echo m68k-cbm-netbsd${UNAME_RELEASE}
   3.196 +      exit 0 ;;
   3.197      amiga:OpenBSD:*:*)
   3.198  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   3.199  	exit 0 ;;
   3.200 @@ -241,12 +156,12 @@
   3.201      wgrisc:OpenBSD:*:*)
   3.202  	echo mipsel-unknown-openbsd${UNAME_RELEASE}
   3.203  	exit 0 ;;
   3.204 -    *:OS/390:*:*)
   3.205 -	echo i370-ibm-openedition
   3.206 -	exit 0 ;;
   3.207      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   3.208  	echo arm-acorn-riscix${UNAME_RELEASE}
   3.209  	exit 0;;
   3.210 +    arm32:NetBSD:*:*)
   3.211 +	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   3.212 +	exit 0 ;;
   3.213      SR2?01:HI-UX/MPP:*:*)
   3.214  	echo hppa1.1-hitachi-hiuxmpp
   3.215  	exit 0;;
   3.216 @@ -303,12 +218,15 @@
   3.217      aushp:SunOS:*:*)
   3.218  	echo sparc-auspex-sunos${UNAME_RELEASE}
   3.219  	exit 0 ;;
   3.220 +    atari*:NetBSD:*:*)
   3.221 +	echo m68k-atari-netbsd${UNAME_RELEASE}
   3.222 +	exit 0 ;;
   3.223      atari*:OpenBSD:*:*)
   3.224  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   3.225  	exit 0 ;;
   3.226      # The situation for MiNT is a little confusing.  The machine name
   3.227      # can be virtually everything (everything which is not
   3.228 -    # "atarist" or "atariste" at least should have a processor
   3.229 +    # "atarist" or "atariste" at least should have a processor 
   3.230      # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
   3.231      # to the lowercase version "mint" (or "freemint").  Finally
   3.232      # the system name "TOS" denotes a system which is actually not
   3.233 @@ -332,9 +250,15 @@
   3.234      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   3.235          echo m68k-unknown-mint${UNAME_RELEASE}
   3.236          exit 0 ;;
   3.237 +    sun3*:NetBSD:*:*)
   3.238 +	echo m68k-sun-netbsd${UNAME_RELEASE}
   3.239 +	exit 0 ;;
   3.240      sun3*:OpenBSD:*:*)
   3.241  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   3.242  	exit 0 ;;
   3.243 +    mac68k:NetBSD:*:*)
   3.244 +	echo m68k-apple-netbsd${UNAME_RELEASE}
   3.245 +	exit 0 ;;
   3.246      mac68k:OpenBSD:*:*)
   3.247  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   3.248  	exit 0 ;;
   3.249 @@ -347,6 +271,9 @@
   3.250      powerpc:machten:*:*)
   3.251  	echo powerpc-apple-machten${UNAME_RELEASE}
   3.252  	exit 0 ;;
   3.253 +    macppc:NetBSD:*:*)
   3.254 +        echo powerpc-apple-netbsd${UNAME_RELEASE}
   3.255 +        exit 0 ;;
   3.256      RISC*:Mach:*:*)
   3.257  	echo mips-dec-mach_bsd4.3
   3.258  	exit 0 ;;
   3.259 @@ -362,7 +289,6 @@
   3.260      mips:*:*:UMIPS | mips:*:*:RISCos)
   3.261  	sed 's/^	//' << EOF >$dummy.c
   3.262  #ifdef __cplusplus
   3.263 -#include <stdio.h>  /* for printf() prototype */
   3.264  	int main (int argc, char *argv[]) {
   3.265  #else
   3.266  	int main (argc, argv) int argc; char *argv[]; {
   3.267 @@ -402,18 +328,15 @@
   3.268      AViiON:dgux:*:*)
   3.269          # DG/UX returns AViiON for all architectures
   3.270          UNAME_PROCESSOR=`/usr/bin/uname -p`
   3.271 -	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   3.272 -	then
   3.273 -	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   3.274 -	       [ ${TARGET_BINARY_INTERFACE}x = x ]
   3.275 -	    then
   3.276 +        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
   3.277 +	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
   3.278 +	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
   3.279  		echo m88k-dg-dgux${UNAME_RELEASE}
   3.280 -	    else
   3.281 +	else
   3.282  		echo m88k-dg-dguxbcs${UNAME_RELEASE}
   3.283 -	    fi
   3.284 -	else
   3.285 -	    echo i586-dg-dgux${UNAME_RELEASE}
   3.286  	fi
   3.287 +        else echo i586-dg-dgux${UNAME_RELEASE}
   3.288 +        fi
   3.289   	exit 0 ;;
   3.290      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   3.291  	echo m88k-dolphin-sysv3
   3.292 @@ -479,7 +402,7 @@
   3.293      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
   3.294  	echo romp-ibm-bsd4.4
   3.295  	exit 0 ;;
   3.296 -    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
   3.297 +    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
   3.298  	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
   3.299  	exit 0 ;;                           # report: romp-ibm BSD 4.3
   3.300      *:BOSX:*:*)
   3.301 @@ -500,8 +423,6 @@
   3.302  	    9000/[34]?? )         HP_ARCH=m68k ;;
   3.303  	    9000/[678][0-9][0-9])
   3.304                sed 's/^              //' << EOF >$dummy.c
   3.305 -
   3.306 -              #define _HPUX_SOURCE
   3.307                #include <stdlib.h>
   3.308                #include <unistd.h>
   3.309  
   3.310 @@ -532,7 +453,7 @@
   3.311                    exit (0);
   3.312                }
   3.313  EOF
   3.314 -	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
   3.315 +	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
   3.316  	rm -f $dummy.c $dummy
   3.317  	esac
   3.318  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   3.319 @@ -626,13 +547,10 @@
   3.320  	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
   3.321  	exit 0 ;;
   3.322      CRAY*TS:*:*:*)
   3.323 -	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   3.324 +	echo t90-cray-unicos${UNAME_RELEASE}
   3.325  	exit 0 ;;
   3.326      CRAY*T3E:*:*:*)
   3.327 -	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   3.328 -	exit 0 ;;
   3.329 -    CRAY*SV1:*:*:*)
   3.330 -	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   3.331 +	echo t3e-cray-unicosmk${UNAME_RELEASE}
   3.332  	exit 0 ;;
   3.333      CRAY-2:*:*:*)
   3.334  	echo cray2-cray-unicos
   3.335 @@ -645,10 +563,13 @@
   3.336      F301:UNIX_System_V:*:*)
   3.337         echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
   3.338         exit 0 ;;
   3.339 +    hp3[0-9][05]:NetBSD:*:*)
   3.340 +	echo m68k-hp-netbsd${UNAME_RELEASE}
   3.341 +	exit 0 ;;
   3.342      hp300:OpenBSD:*:*)
   3.343  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   3.344  	exit 0 ;;
   3.345 -    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   3.346 +    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
   3.347  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   3.348  	exit 0 ;;
   3.349      sparc*:BSD/OS:*:*)
   3.350 @@ -658,8 +579,17 @@
   3.351  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   3.352  	exit 0 ;;
   3.353      *:FreeBSD:*:*)
   3.354 +	if test -x /usr/bin/objformat; then
   3.355 +	    if test "elf" = "`/usr/bin/objformat`"; then
   3.356 +		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
   3.357 +		exit 0
   3.358 +	    fi
   3.359 +	fi
   3.360  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   3.361  	exit 0 ;;
   3.362 +    *:NetBSD:*:*)
   3.363 +	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   3.364 +	exit 0 ;;
   3.365      *:OpenBSD:*:*)
   3.366  	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   3.367  	exit 0 ;;
   3.368 @@ -669,9 +599,6 @@
   3.369      i*:MINGW*:*)
   3.370  	echo ${UNAME_MACHINE}-pc-mingw32
   3.371  	exit 0 ;;
   3.372 -    i*:PW*:*)
   3.373 -	echo ${UNAME_MACHINE}-pc-pw32
   3.374 -	exit 0 ;;
   3.375      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   3.376  	# How do we know it's Interix rather than the generic POSIX subsystem?
   3.377  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
   3.378 @@ -690,10 +617,13 @@
   3.379      *:GNU:*:*)
   3.380  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   3.381  	exit 0 ;;
   3.382 -    i*86:Minix:*:*)
   3.383 -	echo ${UNAME_MACHINE}-pc-minix
   3.384 -	exit 0 ;;
   3.385      *:Linux:*:*)
   3.386 +#	# uname on the ARM produces all sorts of strangeness, and we need to
   3.387 +#	# filter it out.
   3.388 +#	case "$UNAME_MACHINE" in
   3.389 +#	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
   3.390 +#	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
   3.391 +#	esac
   3.392  
   3.393  	# The BFD linker knows what the default object file format is, so
   3.394  	# first see if it will tell us. cd to the root directory to prevent
   3.395 @@ -706,42 +636,13 @@
   3.396  				    s/ .*//
   3.397  				    p'`
   3.398          case "$ld_supported_emulations" in
   3.399 -	  *ia64)
   3.400 -		echo "${UNAME_MACHINE}-unknown-linux"
   3.401 -		exit 0
   3.402 -		;;
   3.403 -	  i?86linux)
   3.404 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
   3.405 -		exit 0
   3.406 -		;;
   3.407 -	  elf_i?86)
   3.408 -		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
   3.409 -		;;
   3.410 -	  i?86coff)
   3.411 -		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
   3.412 -		exit 0
   3.413 -		;;
   3.414 -	  sparclinux)
   3.415 -		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
   3.416 -		exit 0
   3.417 -		;;
   3.418 -	  armlinux)
   3.419 -		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
   3.420 -		exit 0
   3.421 -		;;
   3.422 -	  elf32arm*)
   3.423 -		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
   3.424 -		exit 0
   3.425 -		;;
   3.426 -	  armelf_linux*)
   3.427 -		echo "${UNAME_MACHINE}-unknown-linux-gnu"
   3.428 -		exit 0
   3.429 -		;;
   3.430 -	  m68klinux)
   3.431 -		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
   3.432 -		exit 0
   3.433 -		;;
   3.434 -	  elf32ppc | elf32ppclinux)
   3.435 +	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
   3.436 +	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
   3.437 +	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   3.438 +	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   3.439 +	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   3.440 +	  elf32arm)   echo "${UNAME_MACHINE}-unknown-linux-gnu"     ; exit 0 ;;
   3.441 +	  elf32ppc)
   3.442  		# Determine Lib Version
   3.443  		cat >$dummy.c <<EOF
   3.444  #include <features.h>
   3.445 @@ -768,65 +669,49 @@
   3.446  			if test "$?" = 0 ; then
   3.447  				LIBC="libc1"
   3.448  			fi
   3.449 -		fi
   3.450 +		fi	
   3.451  		rm -f $dummy.c $dummy
   3.452 -		echo powerpc-unknown-linux-gnu${LIBC}
   3.453 -		exit 0
   3.454 -		;;
   3.455 -	  shelf_linux)
   3.456 -		echo "${UNAME_MACHINE}-unknown-linux-gnu"
   3.457 -		exit 0
   3.458 -		;;
   3.459 +		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
   3.460  	esac
   3.461  
   3.462  	if test "${UNAME_MACHINE}" = "alpha" ; then
   3.463 -		cat <<EOF >$dummy.s
   3.464 -			.data
   3.465 -		\$Lformat:
   3.466 -			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
   3.467 -
   3.468 -			.text
   3.469 -			.globl main
   3.470 -			.align 4
   3.471 -			.ent main
   3.472 -		main:
   3.473 -			.frame \$30,16,\$26,0
   3.474 -			ldgp \$29,0(\$27)
   3.475 -			.prologue 1
   3.476 -			.long 0x47e03d80 # implver \$0
   3.477 -			lda \$2,-1
   3.478 -			.long 0x47e20c21 # amask \$2,\$1
   3.479 -			lda \$16,\$Lformat
   3.480 -			mov \$0,\$17
   3.481 -			not \$1,\$18
   3.482 -			jsr \$26,printf
   3.483 -			ldgp \$29,0(\$26)
   3.484 -			mov 0,\$16
   3.485 -			jsr \$26,exit
   3.486 -			.end main
   3.487 +		sed 's/^	//'  <<EOF >$dummy.s
   3.488 +		.globl main
   3.489 +		.ent main
   3.490 +	main:
   3.491 +		.frame \$30,0,\$26,0
   3.492 +		.prologue 0
   3.493 +		.long 0x47e03d80 # implver $0
   3.494 +		lda \$2,259
   3.495 +		.long 0x47e20c21 # amask $2,$1
   3.496 +		srl \$1,8,\$2
   3.497 +		sll \$2,2,\$2
   3.498 +		sll \$0,3,\$0
   3.499 +		addl \$1,\$0,\$0
   3.500 +		addl \$2,\$0,\$0
   3.501 +		ret \$31,(\$26),1
   3.502 +		.end main
   3.503  EOF
   3.504  		LIBC=""
   3.505  		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   3.506  		if test "$?" = 0 ; then
   3.507 -			case `./$dummy` in
   3.508 -			0-0)
   3.509 +			./$dummy
   3.510 +			case "$?" in
   3.511 +			7)
   3.512  				UNAME_MACHINE="alpha"
   3.513  				;;
   3.514 -			1-0)
   3.515 +			15)
   3.516  				UNAME_MACHINE="alphaev5"
   3.517  				;;
   3.518 -			1-1)
   3.519 +			14)
   3.520  				UNAME_MACHINE="alphaev56"
   3.521  				;;
   3.522 -			1-101)
   3.523 +			10)
   3.524  				UNAME_MACHINE="alphapca56"
   3.525  				;;
   3.526 -			2-303)
   3.527 +			16)
   3.528  				UNAME_MACHINE="alphaev6"
   3.529  				;;
   3.530 -			2-307)
   3.531 -				UNAME_MACHINE="alphaev67"
   3.532 -				;;
   3.533  			esac
   3.534  
   3.535  			objdump --private-headers $dummy | \
   3.536 @@ -840,7 +725,6 @@
   3.537  	elif test "${UNAME_MACHINE}" = "mips" ; then
   3.538  	  cat >$dummy.c <<EOF
   3.539  #ifdef __cplusplus
   3.540 -#include <stdio.h>  /* for printf() prototype */
   3.541  	int main (int argc, char *argv[]) {
   3.542  #else
   3.543  	int main (argc, argv) int argc; char *argv[]; {
   3.544 @@ -856,10 +740,6 @@
   3.545  EOF
   3.546  	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
   3.547  	  rm -f $dummy.c $dummy
   3.548 -	elif test "${UNAME_MACHINE}" = "s390"; then
   3.549 -	  echo s390-ibm-linux && exit 0
   3.550 -	elif test "${UNAME_MACHINE}" = "x86_64"; then
   3.551 -	  echo x86_64-unknown-linux-gnu && exit 0
   3.552  	else
   3.553  	  # Either a pre-BFD a.out linker (linux-gnuoldld)
   3.554  	  # or one that does not give us useful --help.
   3.555 @@ -881,7 +761,6 @@
   3.556  	  cat >$dummy.c <<EOF
   3.557  #include <features.h>
   3.558  #ifdef __cplusplus
   3.559 -#include <stdio.h>  /* for printf() prototype */
   3.560  	int main (int argc, char *argv[]) {
   3.561  #else
   3.562  	int main (argc, argv) int argc; char *argv[]; {
   3.563 @@ -904,7 +783,6 @@
   3.564  EOF
   3.565  	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
   3.566  	  rm -f $dummy.c $dummy
   3.567 -	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
   3.568  	fi ;;
   3.569  # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
   3.570  # are messed up and put the nodename in both sysname and nodename.
   3.571 @@ -920,21 +798,19 @@
   3.572  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   3.573  	exit 0 ;;
   3.574      i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
   3.575 -	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
   3.576  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
   3.577 -		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
   3.578 +		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
   3.579  	else
   3.580 -		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
   3.581 +		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
   3.582  	fi
   3.583  	exit 0 ;;
   3.584      i?86:*:5:7*)
   3.585 -        # Fixed at (any) Pentium or better
   3.586 -        UNAME_MACHINE=i586
   3.587 -        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
   3.588 -	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
   3.589 -	else
   3.590 -	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
   3.591 -	fi
   3.592 +	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
   3.593 +	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
   3.594 +	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
   3.595 +	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
   3.596 +	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
   3.597 +	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
   3.598  	exit 0 ;;
   3.599      i?86:*:3.2:*)
   3.600  	if test -f /usr/options/cb.name; then
   3.601 @@ -954,11 +830,7 @@
   3.602  		echo ${UNAME_MACHINE}-pc-sysv32
   3.603  	fi
   3.604  	exit 0 ;;
   3.605 -    i?86:*DOS:*:*)
   3.606 -	echo ${UNAME_MACHINE}-pc-msdosdjgpp
   3.607 -	exit 0 ;;
   3.608      pc:*:*:*)
   3.609 -	# Left here for compatibility:
   3.610          # uname -m prints for DJGPP always 'pc', but it prints nothing about
   3.611          # the processor, so we play safe by assuming i386.
   3.612  	echo i386-pc-msdosdjgpp
   3.613 @@ -1041,7 +913,7 @@
   3.614      mc68*:A/UX:*:*)
   3.615  	echo m68k-apple-aux${UNAME_RELEASE}
   3.616  	exit 0 ;;
   3.617 -    news*:NEWS-OS:6*:*)
   3.618 +    news*:NEWS-OS:*:6*)
   3.619  	echo mips-sony-newsos6
   3.620  	exit 0 ;;
   3.621      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
   3.622 @@ -1072,38 +944,6 @@
   3.623      *:Rhapsody:*:*)
   3.624  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
   3.625  	exit 0 ;;
   3.626 -    *:Darwin:*:*)
   3.627 -	echo `uname -p`-apple-darwin${UNAME_RELEASE}
   3.628 -	exit 0 ;;
   3.629 -    *:procnto*:*:* | *:QNX:[0123456789]*:*)
   3.630 -	if test "${UNAME_MACHINE}" = "x86pc"; then
   3.631 -		UNAME_MACHINE=pc
   3.632 -	fi
   3.633 -	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
   3.634 -	exit 0 ;;
   3.635 -    *:QNX:*:4*)
   3.636 -	echo i386-pc-qnx
   3.637 -	exit 0 ;;
   3.638 -    NSR-[KW]:NONSTOP_KERNEL:*:*)
   3.639 -	echo nsr-tandem-nsk${UNAME_RELEASE}
   3.640 -	exit 0 ;;
   3.641 -    BS2000:POSIX*:*:*)
   3.642 -	echo bs2000-siemens-sysv
   3.643 -	exit 0 ;;
   3.644 -    DS/*:UNIX_System_V:*:*)
   3.645 -	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
   3.646 -	exit 0 ;;
   3.647 -    *:Plan9:*:*)
   3.648 -	# "uname -m" is not consistent, so use $cputype instead. 386
   3.649 -	# is converted to i386 for consistency with other x86
   3.650 -	# operating systems.
   3.651 -	if test "$cputype" = "386"; then
   3.652 -	    UNAME_MACHINE=i386
   3.653 -	else
   3.654 -	    UNAME_MACHINE="$cputype"
   3.655 -	fi
   3.656 -	echo ${UNAME_MACHINE}-unknown-plan9
   3.657 -	exit 0 ;;
   3.658  esac
   3.659  
   3.660  #echo '(No uname command or uname output not recognized.)' 1>&2
   3.661 @@ -1243,47 +1083,6 @@
   3.662      esac
   3.663  fi
   3.664  
   3.665 -cat >&2 <<EOF
   3.666 -$0: unable to guess system type
   3.667 -
   3.668 -The $version version of this script cannot recognize your system type.
   3.669 -Please download the most up to date version of the config scripts:
   3.670 -
   3.671 -    ftp://ftp.gnu.org/pub/gnu/config/
   3.672 -
   3.673 -If the version you run ($0) is already up to date, please
   3.674 -send the following data and any information you think might be
   3.675 -pertinent to <config-patches@gnu.org> in order to provide the needed
   3.676 -information to handle your system.
   3.677 -
   3.678 -config.guess version = $version
   3.679 -
   3.680 -uname -m = `(uname -m) 2>/dev/null || echo unknown`
   3.681 -uname -r = `(uname -r) 2>/dev/null || echo unknown`
   3.682 -uname -s = `(uname -s) 2>/dev/null || echo unknown`
   3.683 -uname -v = `(uname -v) 2>/dev/null || echo unknown`
   3.684 -
   3.685 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
   3.686 -/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
   3.687 -
   3.688 -hostinfo               = `(hostinfo) 2>/dev/null`
   3.689 -/bin/universe          = `(/bin/universe) 2>/dev/null`
   3.690 -/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
   3.691 -/bin/arch              = `(/bin/arch) 2>/dev/null`
   3.692 -/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
   3.693 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
   3.694 -
   3.695 -UNAME_MACHINE = ${UNAME_MACHINE}
   3.696 -UNAME_RELEASE = ${UNAME_RELEASE}
   3.697 -UNAME_SYSTEM  = ${UNAME_SYSTEM}
   3.698 -UNAME_VERSION = ${UNAME_VERSION}
   3.699 -EOF
   3.700 +#echo '(Unable to guess system type)' 1>&2
   3.701  
   3.702  exit 1
   3.703 -
   3.704 -# Local variables:
   3.705 -# eval: (add-hook 'write-file-hooks 'time-stamp)
   3.706 -# time-stamp-start: "version='"
   3.707 -# time-stamp-format: "%:y-%02m-%02d"
   3.708 -# time-stamp-end: "'"
   3.709 -# End:
     4.1 --- a/test/config.sub	Thu Jun 07 15:04:04 2001 +0000
     4.2 +++ b/test/config.sub	Sun Jun 10 04:54:53 2001 +0000
     4.3 @@ -1,10 +1,6 @@
     4.4  #! /bin/sh
     4.5  # Configuration validation subroutine script, version 1.1.
     4.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
     4.7 -#   Free Software Foundation, Inc.
     4.8 -
     4.9 -version='2000-09-11'
    4.10 -
    4.11 +#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
    4.12  # This file is (in principle) common to ALL GNU software.
    4.13  # The presence of a machine in this file suggests that SOME GNU software
    4.14  # can handle that machine.  It does not imply ALL GNU software can.
    4.15 @@ -29,8 +25,6 @@
    4.16  # configuration script generated by Autoconf, you may include it under
    4.17  # the same distribution terms that you use for the rest of that program.
    4.18  
    4.19 -# Please send patches to <config-patches@gnu.org>.
    4.20 -#
    4.21  # Configuration subroutine to validate and canonicalize a configuration type.
    4.22  # Supply the specified configuration type as an argument.
    4.23  # If it is invalid, we print an error message on stderr and exit with code 1.
    4.24 @@ -51,61 +45,30 @@
    4.25  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    4.26  # It is wrong to echo any other type of specification.
    4.27  
    4.28 -me=`echo "$0" | sed -e 's,.*/,,'`
    4.29 +if [ x$1 = x ]
    4.30 +then
    4.31 +	echo Configuration name missing. 1>&2
    4.32 +	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
    4.33 +	echo "or     $0 ALIAS" 1>&2
    4.34 +	echo where ALIAS is a recognized configuration type. 1>&2
    4.35 +	exit 1
    4.36 +fi
    4.37  
    4.38 -usage="\
    4.39 -Usage: $0 [OPTION] CPU-MFR-OPSYS
    4.40 -       $0 [OPTION] ALIAS
    4.41 -
    4.42 -Canonicalize a configuration name.
    4.43 -
    4.44 -Operation modes:
    4.45 -  -h, --help               print this help, then exit
    4.46 -  -V, --version            print version number, then exit"
    4.47 -
    4.48 -help="
    4.49 -Try \`$me --help' for more information."
    4.50 -
    4.51 -# Parse command line
    4.52 -while test $# -gt 0 ; do
    4.53 -  case "$1" in
    4.54 -    --version | --vers* | -V )
    4.55 -       echo "$version" ; exit 0 ;;
    4.56 -    --help | --h* | -h )
    4.57 -       echo "$usage"; exit 0 ;;
    4.58 -    -- )     # Stop option processing
    4.59 -       shift; break ;;
    4.60 -    - )	# Use stdin as input.
    4.61 -       break ;;
    4.62 -    -* )
    4.63 -       exec >&2
    4.64 -       echo "$me: invalid option $1"
    4.65 -       echo "$help"
    4.66 -       exit 1 ;;
    4.67 -
    4.68 -    *local*)
    4.69 -       # First pass through any local machine types.
    4.70 -       echo $1
    4.71 -       exit 0;;
    4.72 -
    4.73 -    * )
    4.74 -       break ;;
    4.75 -  esac
    4.76 -done
    4.77 -
    4.78 -case $# in
    4.79 - 0) echo "$me: missing argument$help" >&2
    4.80 -    exit 1;;
    4.81 - 1) ;;
    4.82 - *) echo "$me: too many arguments$help" >&2
    4.83 -    exit 1;;
    4.84 +# First pass through any local machine types.
    4.85 +case $1 in
    4.86 +	*local*)
    4.87 +		echo $1
    4.88 +		exit 0
    4.89 +		;;
    4.90 +	*)
    4.91 +	;;
    4.92  esac
    4.93  
    4.94  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
    4.95  # Here we must recognize all the valid KERNEL-OS combinations.
    4.96  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    4.97  case $maybe_os in
    4.98 -  nto-qnx* | linux-gnu*)
    4.99 +  linux-gnu*)
   4.100      os=-$maybe_os
   4.101      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   4.102      ;;
   4.103 @@ -131,7 +94,7 @@
   4.104  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   4.105  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   4.106  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   4.107 -	-apple | -axis)
   4.108 +	-apple)
   4.109  		os=
   4.110  		basic_machine=$1
   4.111  		;;
   4.112 @@ -142,7 +105,7 @@
   4.113  	-scout)
   4.114  		;;
   4.115  	-wrs)
   4.116 -		os=-vxworks
   4.117 +		os=vxworks
   4.118  		basic_machine=$1
   4.119  		;;
   4.120  	-hiux*)
   4.121 @@ -193,46 +156,33 @@
   4.122  	-psos*)
   4.123  		os=-psos
   4.124  		;;
   4.125 -	-mint | -mint[0-9]*)
   4.126 -		basic_machine=m68k-atari
   4.127 -		os=-mint
   4.128 -		;;
   4.129  esac
   4.130  
   4.131  # Decode aliases for certain CPU-COMPANY combinations.
   4.132  case $basic_machine in
   4.133  	# Recognize the basic CPU types without company name.
   4.134  	# Some are omitted here because they have special meanings below.
   4.135 -	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
   4.136 -		| arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
   4.137 +	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
   4.138 +		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
   4.139  		| 580 | i960 | h8300 \
   4.140 -		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
   4.141  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
   4.142 -		| hppa64 \
   4.143 -		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
   4.144 -		| alphaev6[78] \
   4.145 -		| we32k | ns16k | clipper | i370 | sh | sh[34] \
   4.146 -		| powerpc | powerpcle \
   4.147 +		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
   4.148 +		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
   4.149  		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
   4.150  		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
   4.151  		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
   4.152 -		| mips64vr5000 | miprs64vr5000el | mcore \
   4.153 -		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
   4.154 -		| thumb | d10v | d30v | fr30 | avr)
   4.155 +		| mips64vr5000 | miprs64vr5000el \
   4.156 +		| armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
   4.157 +		| thumb | d10v)
   4.158  		basic_machine=$basic_machine-unknown
   4.159  		;;
   4.160 -	m6811 | m68hc11 | m6812 | m68hc12)
   4.161 -		# Motorola 68HC11/12.
   4.162 -		basic_machine=$basic_machine-unknown
   4.163 -		os=-none
   4.164 -		;;
   4.165 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
   4.166 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
   4.167  		;;
   4.168  
   4.169  	# We use `pc' rather than `unknown'
   4.170  	# because (1) that's what they normally are, and
   4.171  	# (2) the word "unknown" tends to confuse beginning users.
   4.172 -	i[234567]86 | x86_64)
   4.173 +	i[34567]86)
   4.174  	  basic_machine=$basic_machine-pc
   4.175  	  ;;
   4.176  	# Object if more than one company name word.
   4.177 @@ -241,28 +191,24 @@
   4.178  		exit 1
   4.179  		;;
   4.180  	# Recognize the basic CPU types with company name.
   4.181 -	# FIXME: clean up the formatting here.
   4.182 -	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
   4.183 +	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
   4.184  	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
   4.185  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
   4.186  	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
   4.187  	      | xmp-* | ymp-* \
   4.188 -	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
   4.189 -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
   4.190 -	      | hppa2.0n-* | hppa64-* \
   4.191 -	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
   4.192 -	      | alphaev6[78]-* \
   4.193 +	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
   4.194 +	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
   4.195  	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
   4.196  	      | clipper-* | orion-* \
   4.197  	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
   4.198  	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
   4.199  	      | mips64el-* | mips64orion-* | mips64orionel-* \
   4.200  	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
   4.201 -	      | mipstx39-* | mipstx39el-* | mcore-* \
   4.202 -	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
   4.203 +	      | mipstx39-* | mipstx39el-* \
   4.204 +	      | armv[34][lb]-* \
   4.205 +	      | f301-* | armv*-* | t3e-* \
   4.206  	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
   4.207 -	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
   4.208 -	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
   4.209 +	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
   4.210  		;;
   4.211  	# Recognize the various machine names and aliases which stand
   4.212  	# for a CPU type and a company and sometimes even an OS.
   4.213 @@ -299,14 +245,14 @@
   4.214  		os=-sysv
   4.215  		;;
   4.216  	amiga | amiga-*)
   4.217 -		basic_machine=m68k-unknown
   4.218 +		basic_machine=m68k-cbm
   4.219  		;;
   4.220  	amigaos | amigados)
   4.221 -		basic_machine=m68k-unknown
   4.222 +		basic_machine=m68k-cbm
   4.223  		os=-amigaos
   4.224  		;;
   4.225  	amigaunix | amix)
   4.226 -		basic_machine=m68k-unknown
   4.227 +		basic_machine=m68k-cbm
   4.228  		os=-sysv4
   4.229  		;;
   4.230  	apollo68)
   4.231 @@ -360,9 +306,6 @@
   4.232  	crds | unos)
   4.233  		basic_machine=m68k-crds
   4.234  		;;
   4.235 -	cris | cris-* | etrax*)
   4.236 -		basic_machine=cris-axis
   4.237 -		;;
   4.238  	da30 | da30-*)
   4.239  		basic_machine=m68k-da30
   4.240  		;;
   4.241 @@ -483,6 +426,7 @@
   4.242  		;;
   4.243  	i370-ibm* | ibm*)
   4.244  		basic_machine=i370-ibm
   4.245 +		os=-mvs
   4.246  		;;
   4.247  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   4.248  	i[34567]86v32)
   4.249 @@ -517,10 +461,6 @@
   4.250  		basic_machine=i386-unknown
   4.251  		os=-mingw32
   4.252  		;;
   4.253 -	i[34567]86-pw32 | pw32)
   4.254 -		basic_machine=i586-unknown
   4.255 -		os=-pw32
   4.256 -		;;
   4.257  	iris | iris4d)
   4.258  		basic_machine=mips-sgi
   4.259  		case $os in
   4.260 @@ -549,7 +489,7 @@
   4.261  	miniframe)
   4.262  		basic_machine=m68000-convergent
   4.263  		;;
   4.264 -	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   4.265 +	*mint | *MiNT)
   4.266  		basic_machine=m68k-atari
   4.267  		os=-mint
   4.268  		;;
   4.269 @@ -567,10 +507,6 @@
   4.270  	mips3*)
   4.271  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   4.272  		;;
   4.273 -	mmix*)
   4.274 -		basic_machine=mmix-knuth
   4.275 -		os=-mmixware
   4.276 -		;;
   4.277  	monitor)
   4.278  		basic_machine=m68k-rom68k
   4.279  		os=-coff
   4.280 @@ -579,10 +515,6 @@
   4.281  		basic_machine=i386-unknown
   4.282  		os=-msdos
   4.283  		;;
   4.284 -	mvs)
   4.285 -		basic_machine=i370-ibm
   4.286 -		os=-mvs
   4.287 -		;;
   4.288  	ncr3000)
   4.289  		basic_machine=i486-ncr
   4.290  		os=-sysv4
   4.291 @@ -592,7 +524,7 @@
   4.292  		os=-netbsd
   4.293  		;;
   4.294  	netwinder)
   4.295 -		basic_machine=armv4l-rebel
   4.296 +		basic_machine=armv4l-corel
   4.297  		os=-linux
   4.298  		;;
   4.299  	news | news700 | news800 | news900)
   4.300 @@ -643,9 +575,6 @@
   4.301  	np1)
   4.302  		basic_machine=np1-gould
   4.303  		;;
   4.304 -	nsr-tandem)
   4.305 -		basic_machine=nsr-tandem
   4.306 -		;;
   4.307  	op50n-* | op60c-*)
   4.308  		basic_machine=hppa1.1-oki
   4.309  		os=-proelf
   4.310 @@ -678,7 +607,7 @@
   4.311  	pentium | p5 | k5 | k6 | nexen)
   4.312  		basic_machine=i586-pc
   4.313  		;;
   4.314 -	pentiumpro | p6 | 6x86 | athlon)
   4.315 +	pentiumpro | p6 | 6x86)
   4.316  		basic_machine=i686-pc
   4.317  		;;
   4.318  	pentiumii | pentium2)
   4.319 @@ -687,7 +616,7 @@
   4.320  	pentium-* | p5-* | k5-* | k6-* | nexen-*)
   4.321  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   4.322  		;;
   4.323 -	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   4.324 +	pentiumpro-* | p6-* | 6x86-*)
   4.325  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   4.326  		;;
   4.327  	pentiumii-* | pentium2-*)
   4.328 @@ -790,10 +719,6 @@
   4.329  	sun386 | sun386i | roadrunner)
   4.330  		basic_machine=i386-sun
   4.331  		;;
   4.332 -	sv1)
   4.333 -		basic_machine=sv1-cray
   4.334 -		os=-unicos
   4.335 -		;;
   4.336  	symmetry)
   4.337  		basic_machine=i386-sequent
   4.338  		os=-dynix
   4.339 @@ -802,10 +727,6 @@
   4.340  		basic_machine=t3e-cray
   4.341  		os=-unicos
   4.342  		;;
   4.343 -	tic54x | c54x*)
   4.344 -		basic_machine=tic54x-unknown
   4.345 -		os=-coff
   4.346 -		;;
   4.347  	tx39)
   4.348  		basic_machine=mipstx39-unknown
   4.349  		;;
   4.350 @@ -907,9 +828,6 @@
   4.351  	we32k)
   4.352  		basic_machine=we32k-att
   4.353  		;;
   4.354 -	sh3 | sh4)
   4.355 -		base_machine=sh-unknown
   4.356 -		;;
   4.357  	sparc | sparcv9)
   4.358  		basic_machine=sparc-sun
   4.359  		;;
   4.360 @@ -990,25 +908,12 @@
   4.361  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
   4.362  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   4.363  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
   4.364 -	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
   4.365 -	      | -openstep* | -oskit* | -conix* | -pw32*)
   4.366 +	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
   4.367  	# Remember, each alternative MUST END IN *, to match a version number.
   4.368  		;;
   4.369 -	-qnx*)
   4.370 -		case $basic_machine in
   4.371 -		    x86-* | i[34567]86-*)
   4.372 -			;;
   4.373 -		    *)
   4.374 -			os=-nto$os
   4.375 -			;;
   4.376 -		esac
   4.377 -		;;
   4.378 -	-nto*)
   4.379 -		os=-nto-qnx
   4.380 -		;;
   4.381  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
   4.382  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
   4.383 -	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
   4.384 +	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
   4.385  		;;
   4.386  	-mac*)
   4.387  		os=`echo $os | sed -e 's|mac|macos|'`
   4.388 @@ -1022,12 +927,6 @@
   4.389  	-sunos6*)
   4.390  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
   4.391  		;;
   4.392 -	-opened*)
   4.393 -		os=-openedition
   4.394 -		;;
   4.395 -	-wince*)
   4.396 -		os=-wince
   4.397 -		;;
   4.398  	-osfrose*)
   4.399  		os=-osfrose
   4.400  		;;
   4.401 @@ -1052,9 +951,6 @@
   4.402  	-ns2 )
   4.403  	        os=-nextstep2
   4.404  		;;
   4.405 -	-nsk*)
   4.406 -		os=-nsk
   4.407 -		;;
   4.408  	# Preserve the version number of sinix5.
   4.409  	-sinix5.*)
   4.410  		os=`echo $os | sed -e 's|sinix|sysv|'`
   4.411 @@ -1117,7 +1013,7 @@
   4.412  	*-acorn)
   4.413  		os=-riscix1.2
   4.414  		;;
   4.415 -	arm*-rebel)
   4.416 +	arm*-corel)
   4.417  		os=-linux
   4.418  		;;
   4.419  	arm*-semi)
   4.420 @@ -1291,7 +1187,7 @@
   4.421  			-genix*)
   4.422  				vendor=ns
   4.423  				;;
   4.424 -			-mvs* | -opened*)
   4.425 +			-mvs*)
   4.426  				vendor=ibm
   4.427  				;;
   4.428  			-ptx*)
   4.429 @@ -1318,11 +1214,3 @@
   4.430  esac
   4.431  
   4.432  echo $basic_machine$os
   4.433 -exit 0
   4.434 -
   4.435 -# Local variables:
   4.436 -# eval: (add-hook 'write-file-hooks 'time-stamp)
   4.437 -# time-stamp-start: "version='"
   4.438 -# time-stamp-format: "%:y-%02m-%02d"
   4.439 -# time-stamp-end: "'"
   4.440 -# End:
     5.1 --- a/test/configure.in	Thu Jun 07 15:04:04 2001 +0000
     5.2 +++ b/test/configure.in	Sun Jun 10 04:54:53 2001 +0000
     5.3 @@ -3,12 +3,14 @@
     5.4  
     5.5  dnl Setup for automake
     5.6  SDL_VERSION=1.2.0
     5.7 -AM_INIT_AUTOMAKE(SDL_tests, $SDL_VERSION)
     5.8  
     5.9  dnl Detect the canonical host and target build environment
    5.10  AC_CANONICAL_HOST
    5.11  AC_CANONICAL_TARGET
    5.12  
    5.13 +dnl Setup for automake
    5.14 +AM_INIT_AUTOMAKE(SDL_tests, $SDL_VERSION)
    5.15 +
    5.16  dnl Check for tools
    5.17  
    5.18  AC_PROG_CC