Only in HDF4.1r4-osx/config: mh-darwin
diff -rc HDF4.1r4/config.guess HDF4.1r4-osx/config.guess
*** HDF4.1r4/config.guess	Sat Apr 17 10:34:31 1999
--- HDF4.1r4-osx/config.guess	Thu May  3 15:10:31 2001
***************
*** 1,6 ****
! #!/bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
  #
  # 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
--- 1,6 ----
! #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
  #
  # 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
***************
*** 14,20 ****
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
--- 14,20 ----
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
***************
*** 45,80 ****
  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- UNAME_PROCESSOR=`(uname -p) 2>/dev/null` || UNAME_PROCESSOR=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}:${UNAME_PROCESSOR}" in
!     alpha:OSF1:V*:*)
! 	# After 1.2, OSF1 uses "V1.3" for uname -r.
! 	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
! 	exit 0 ;;
      alpha:OSF1:*:*)
  	# 1.2 uses "1.2" for uname -r.
! 	echo alpha-dec-osf${UNAME_RELEASE}
!         exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit 0;;
!     Pyramid*:OSx*:*:*)
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
  		echo pyramid-pyramid-sysv3
  	else
  		echo pyramid-pyramid-bsd
  	fi
  	exit 0 ;;
!     sun4*:SunOS:5.*:*)
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
!     i86pc*:SunOS:*:*)
! 	echo i386-sun-solaris2${UNAME_RELEASE}
  	exit 0 ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
--- 45,166 ----
  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
  trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
  
  # Note: order is significant - the case branches are not exclusive.
  
! case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      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.
! 	cat <<EOF >dummy.s
! 	.globl main
! 	.ent main
! main:
! 	.frame \$30,0,\$26,0
! 	.prologue 0
! 	.long 0x47e03d80 # implver $0
! 	lda \$2,259
! 	.long 0x47e20c21 # amask $2,$1
! 	srl \$1,8,\$2
! 	sll \$2,2,\$2
! 	sll \$0,3,\$0
! 	addl \$1,\$0,\$0
! 	addl \$2,\$0,\$0
! 	ret \$31,(\$26),1
! 	.end main
! EOF
! 	${CC-cc} dummy.s -o dummy 2>/dev/null
! 	if test "$?" = 0 ; then
! 		./dummy
! 		case "$?" in
! 			7)
! 				UNAME_MACHINE="alpha"
! 				;;
! 			15)
! 				UNAME_MACHINE="alphaev5"
! 				;;
! 			14)
! 				UNAME_MACHINE="alphaev56"
! 				;;
! 			10)
! 				UNAME_MACHINE="alphapca56"
! 				;;
! 			16)
! 				UNAME_MACHINE="alphaev6"
! 				;;
! 		esac
! 	fi
! 	rm -f dummy.s dummy
! 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
! 	exit 0 ;;
!     21064:Windows_NT:50:3)
! 	echo alpha-dec-winnt3.5
! 	exit 0 ;;
!     Amiga*:UNIX_System_V:4.0:*)
! 	echo m68k-cbm-sysv4
! 	exit 0;;
!     amiga:NetBSD:*:*)
!       echo m68k-cbm-netbsd${UNAME_RELEASE}
!       exit 0 ;;
!     amiga:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     *:[Aa]miga[Oo][Ss]:*:*)
! 	echo ${UNAME_MACHINE}-unknown-amigaos
! 	exit 0 ;;
!     arc64:OpenBSD:*:*)
! 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     arc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     hkmips:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     pmax:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     sgi:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     wgrisc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit 0;;
!     arm32:NetBSD:*:*)
! 	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
! 	exit 0 ;;
!     SR2?01:HI-UX/MPP:*:*)
! 	echo hppa1.1-hitachi-hiuxmpp
! 	exit 0;;
!     Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
! 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
  		echo pyramid-pyramid-sysv3
  	else
  		echo pyramid-pyramid-bsd
  	fi
  	exit 0 ;;
!     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 ;;
!     i86pc:SunOS:5.*:*)
! 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
***************
*** 83,103 ****
  	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      sun4*:SunOS:*:*)
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
  	exit 0 ;;
      sun3*:SunOS:*:*)
  	echo m68k-sun-sunos${UNAME_RELEASE}
  	exit 0 ;;
      RISC*:ULTRIX:*:*)
  	echo mips-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
      VAX*:ULTRIX*:*:*)
  	echo vax-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
!     mips:*:5*:RISCos)
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
      m88k:CX/UX:7*:*)
  	echo m88k-harris-cxux7
  	exit 0 ;;
--- 169,268 ----
  	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+ 	    Series*|S4*)
+ 		UNAME_RELEASE=`uname -v`
+ 		;;
+ 	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
  	exit 0 ;;
      sun3*:SunOS:*:*)
  	echo m68k-sun-sunos${UNAME_RELEASE}
  	exit 0 ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(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-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun3*:NetBSD:*:*)
+ 	echo m68k-sun-netbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun3*:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mac68k:NetBSD:*:*)
+ 	echo m68k-apple-netbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme88k:OpenBSD:*:*)
+ 	echo m88k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+     macppc:NetBSD:*:*)
+         echo powerpc-apple-netbsd${UNAME_RELEASE}
+         exit 0 ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit 0 ;;
      RISC*:ULTRIX:*:*)
  	echo mips-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
      VAX*:ULTRIX*:*:*)
  	echo vax-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
!     2020: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; {
! 	#if defined (host_mips) && defined (MIPSEB)
! 	#if defined (SYSTYPE_SYSV)
! 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
! 	#endif
! 	#if defined (SYSTYPE_SVR4)
! 	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
! 	#endif
! 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
! 	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
! 	#endif
! 	#endif
! 	  exit (-1);
! 	}
! EOF
! 	${CC-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
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
      m88k:CX/UX:7*:*)
  	echo m88k-harris-cxux7
  	exit 0 ;;
***************
*** 108,119 ****
--- 273,289 ----
  	echo m88k-motorola-sysv3
  	exit 0 ;;
      AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+         if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
  	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
  	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
  		echo m88k-dg-dgux${UNAME_RELEASE}
  	else
  		echo m88k-dg-dguxbcs${UNAME_RELEASE}
  	fi
+         else echo i586-dg-dgux${UNAME_RELEASE}
+         fi
   	exit 0 ;;
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
***************
*** 128,143 ****
      Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
  	echo m68k-tektronix-bsd
  	exit 0 ;;
-     *:IRIX64:6.*:*)		# IRIX 64 bits OS
- 	echo mips-sgi-irix${UNAME_RELEASE}
- 	exit 0 ;;
-     *:IRIX:6.*:*)		# IRIX 6.x but not 64 bits OS
- 	echo mips-sgi-irix6_32
- 	exit 0 ;;
      *:IRIX*:*:*)
! 	echo mips-sgi-irix${UNAME_RELEASE}
  	exit 0 ;;
!     i[34]86:AIX:*:*)
  	echo i386-ibm-aix
  	exit 0 ;;
      *:AIX:2:3)
--- 298,310 ----
      Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
  	echo m68k-tektronix-bsd
  	exit 0 ;;
      *:IRIX*:*:*)
! 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
  	exit 0 ;;
!     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
! 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
! 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
!     i?86:AIX:*:*)
  	echo i386-ibm-aix
  	exit 0 ;;
      *:AIX:2:3)
***************
*** 163,177 ****
  	fi
  	exit 0 ;;
      *:AIX:*:4)
! 	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
  		IBM_ARCH=powerpc
  	fi
! 	if grep bos410 /usr/include/stdio.h >/dev/null 2>&1; then
! 		IBM_REV=4.1
! 	elif grep bos411 /usr/include/stdio.h >/dev/null 2>&1; then
! 		IBM_REV=4.1.1
  	else
  		IBM_REV=4.${UNAME_RELEASE}
  	fi
--- 330,343 ----
  	fi
  	exit 0 ;;
      *:AIX:*:4)
! 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
! 	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
  		IBM_ARCH=powerpc
  	fi
! 	if [ -x /usr/bin/oslevel ] ; then
! 		IBM_REV=`/usr/bin/oslevel`
  	else
  		IBM_REV=4.${UNAME_RELEASE}
  	fi
***************
*** 180,185 ****
--- 346,357 ----
      *:AIX:*:*)
  	echo rs6000-ibm-aix
  	exit 0 ;;
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
      *:BOSX:*:*)
  	echo rs6000-bull-bosx
  	exit 0 ;;
***************
*** 192,203 ****
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
  	echo m68k-hp-bsd4.4
  	exit 0 ;;
!     9000/[3478]??:HP-UX:*:*)
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
! 	    9000/7?? | 9000/8?7 ) HP_ARCH=hppa1.1 ;;
! 	    9000/8?? )            HP_ARCH=hppa1.0 ;;
  	esac
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--- 364,407 ----
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
  	echo m68k-hp-bsd4.4
  	exit 0 ;;
!     9000/[34678]??:HP-UX:*:*)
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
! 	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
!               sed 's/^              //' << EOF >dummy.c
!               #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
! 	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
! 	rm -f dummy.c dummy
  	esac
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
***************
*** 232,249 ****
  	rm -f dummy.c dummy
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
!     9000/7??:4.3bsd:*:* | 9000/8?7:4.3bsd:*:* )
  	echo hppa1.1-hp-bsd
  	exit 0 ;;
      9000/8??:4.3bsd:*:*)
  	echo hppa1.0-hp-bsd
  	exit 0 ;;
!     hp7??:OSF1:*:* | hp8?7:OSF1:*:* )
  	echo hppa1.1-hp-osf
  	exit 0 ;;
      hp8??:OSF1:*:*)
  	echo hppa1.0-hp-osf
  	exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
          exit 0 ;;
--- 436,463 ----
  	rm -f dummy.c dummy
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
!     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
  	echo hppa1.1-hp-bsd
  	exit 0 ;;
      9000/8??:4.3bsd:*:*)
  	echo hppa1.0-hp-bsd
  	exit 0 ;;
!     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
  	echo hppa1.1-hp-osf
  	exit 0 ;;
      hp8??:OSF1:*:*)
  	echo hppa1.0-hp-osf
  	exit 0 ;;
+     i?86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+ 	exit 0 ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+ 	exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
          exit 0 ;;
***************
*** 266,293 ****
  	echo xmp-cray-unicos
          exit 0 ;;
      CRAY*Y-MP:*:*:*)
! 	echo ymp-cray-unicos
!         exit 0 ;;
      CRAY-2:*:*:*)
  	echo cray2-cray-unicos
          exit 0 ;;
!     CRAY*C90:c90:*:*)
! 	echo c90-cray-unicos
!         exit 0 ;;
!     CRAY*J90:*:*:*)
! 	echo j90-cray-unicos
!         exit 0 ;;
!     CRAY*TS:*:*:*)
! 	echo t90-cray-unicos
!         exit 0 ;;
!     CRAY*T3*:*:*:*)
! 	echo t3e-cray-craympp
!         exit 0 ;;
      hp3[0-9][05]:NetBSD:*:*)
  	echo m68k-hp-netbsd${UNAME_RELEASE}
  	exit 0 ;;
!     i[34]86:BSD/386:*:*)
! 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--- 480,517 ----
  	echo xmp-cray-unicos
          exit 0 ;;
      CRAY*Y-MP:*:*:*)
! 	echo ymp-cray-unicos${UNAME_RELEASE}
! 	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/
! 	exit 0 ;;
!     CRAY*TS:*:*:*)
! 	echo t90-cray-unicos${UNAME_RELEASE}
! 	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/\///'`
!         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
!         echo "f300-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}
  	exit 0 ;;
!     hp300:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     sparc*:BSD/OS:*:*)
! 	echo sparc-unknown-bsdi${UNAME_RELEASE}
! 	exit 0 ;;
!     i?86:BSD/386:*:* | *:BSD/OS:*:*)
! 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
***************
*** 295,332 ****
      *:NetBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	exit 0 ;;
      *:GNU:*:*)
! 	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit 0 ;;
      *:Linux:*:*)
! 	echo ${UNAME_MACHINE}-unknown-linux
! 	exit 0 ;;
  # 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[34]86:DYNIX/ptx:4*:*)
  	echo i386-sequent-sysv4
  	exit 0 ;;
!     i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
  	else
! 		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
  	fi
  	exit 0 ;;
!     i[34]86:*:3.2:*)
! 	if /bin/uname -X 2>/dev/null >/dev/null ; then
  		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
  		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
! 		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
! 	elif test -f /usr/options/cb.name; then
! 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
! 		echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
  	else
! 		echo ${UNAME_MACHINE}-unknown-sysv32
  	fi
  	exit 0 ;;
      Intel:Mach:3*:*)
! 	echo i386-unknown-mach3
  	exit 0 ;;
      i860:*:4.*:*) # i860-SVR4
  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
--- 519,726 ----
      *:NetBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit 0 ;;
+     i*:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit 0 ;;
+     p*:CYGWIN*:*)
+ 	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,/.*$,,'`
  	exit 0 ;;
      *:Linux:*:*)
! 	# uname on the ARM produces all sorts of strangeness, and we need to
! 	# filter it out.
! 	case "$UNAME_MACHINE" in
! 	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
! 	esac
! 
! 	# 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`
! 	ld_supported_emulations=`echo $ld_help_string \
! 			 | sed -ne '/supported emulations:/!d
! 				    s/[ 	][ 	]*/ /g
! 				    s/.*supported emulations: *//
! 				    s/ .*//
! 				    p'`
!         case "$ld_supported_emulations" in
! 	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
! 	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
! 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
! 	esac
! 
! 	if test "${UNAME_MACHINE}" = "alpha" ; then
! 		sed 's/^	//'  <<EOF >dummy.s
! 		.globl main
! 		.ent main
! 	main:
! 		.frame \$30,0,\$26,0
! 		.prologue 0
! 		.long 0x47e03d80 # implver $0
! 		lda \$2,259
! 		.long 0x47e20c21 # amask $2,$1
! 		srl \$1,8,\$2
! 		sll \$2,2,\$2
! 		sll \$0,3,\$0
! 		addl \$1,\$0,\$0
! 		addl \$2,\$0,\$0
! 		ret \$31,(\$26),1
! 		.end main
! EOF
! 		LIBC=""
! 		${CC-cc} dummy.s -o dummy 2>/dev/null
! 		if test "$?" = 0 ; then
! 			./dummy
! 			case "$?" in
! 			7)
! 				UNAME_MACHINE="alpha"
! 				;;
! 			15)
! 				UNAME_MACHINE="alphaev5"
! 				;;
! 			14)
! 				UNAME_MACHINE="alphaev56"
! 				;;
! 			10)
! 				UNAME_MACHINE="alphapca56"
! 				;;
! 			16)
! 				UNAME_MACHINE="alphaev6"
! 				;;
! 			esac	
! 
! 			objdump --private-headers dummy | \
! 			  grep ld.so.1 > /dev/null
! 			if test "$?" = 0 ; then
! 				LIBC="libc1"
! 			fi
! 		fi	
! 		rm -f dummy.s dummy
! 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
! 	elif test "${UNAME_MACHINE}" = "mips" ; then
! 	  cat >dummy.c <<EOF
! main(argc, argv)
!      int argc;
!      char *argv[];
! {
! #ifdef __MIPSEB__
!   printf ("%s-unknown-linux-gnu\n", argv[1]);
! #endif
! #ifdef __MIPSEL__
!   printf ("%sel-unknown-linux-gnu\n", argv[1]);
! #endif
!   return 0;
! }
! EOF
! 	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
! 	  rm -f dummy.c dummy
! 	else
! 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
! 	  # or one that does not give us useful --help.
! 	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
! 	  # If ld does not provide *any* "supported emulations:"
! 	  # that means it is gnuoldld.
! 	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
! 	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
! 
! 	  case "${UNAME_MACHINE}" in
! 	  i?86)
! 	    VENDOR=pc;
! 	    ;;
! 	  *)
! 	    VENDOR=unknown;
! 	    ;;
! 	  esac
! 	  # Determine whether the default compiler is a.out or elf
! 	  cat >dummy.c <<EOF
! #include <features.h>
! main(argc, argv)
!      int argc;
!      char *argv[];
! {
! #ifdef __ELF__
! # ifdef __GLIBC__
! #  if __GLIBC__ >= 2
!     printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
! #  else
!     printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! #  endif
! # else
!    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! # endif
! #else
!   printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
! #endif
!   return 0;
! }
! EOF
! 	  ${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*:*)
  	echo i386-sequent-sysv4
  	exit 0 ;;
!     i?86:UNIX_SV:4.2MP:2.*)
!         # Unixware is an offshoot of SVR4, but it has its own version
!         # number series starting with 2...
!         # I am not positive that other SVR4 systems won't match this,
! 	# I just have to hope.  -- rms.
!         # Use sysv4.2uw... so that sysv4* matches it.
! 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
! 	exit 0 ;;
!     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
  	else
! 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
  	fi
  	exit 0 ;;
!     i?86:*:3.2:*)
! 	if test -f /usr/options/cb.name; then
! 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
! 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
! 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
  		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
  		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
! 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
! 			&& UNAME_MACHINE=i586
! 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  	else
! 		echo ${UNAME_MACHINE}-pc-sysv32
! 	fi
! 	exit 0 ;;
!     i?86:UnixWare:*:*)
! 	if /bin/uname -X 2>/dev/null >/dev/null ; then
! 	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
! 	    && UNAME_MACHINE=i586
  	fi
+ 	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
  	exit 0 ;;
+     pc:*:*:*)
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+         exit 0 ;;
      Intel:Mach:3*:*)
! 	echo i386-pc-mach3
! 	exit 0 ;;
!     paragon:*:*:*)
! 	echo i860-intel-osf1
  	exit 0 ;;
      i860:*:4.*:*) # i860-SVR4
  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
***************
*** 339,373 ****
  	# "miniframe"
  	echo m68010-convergent-sysv
  	exit 0 ;;
!     M680[234]0:*:R3V[567]*:*)
  	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
!     3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
!         uname -p 2>/dev/null | grep 86 >/dev/null \
!           && echo i486-ncr-sysv4.3 && exit 0 ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
!         uname -p 2>/dev/null | grep 86 >/dev/null \
            && echo i486-ncr-sysv4 && exit 0 ;;
!     m680[234]0:LynxOS:2.2*:*)
! 	echo m68k-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
  	exit 0 ;;
!     i[34]86:LynxOS:2.2*:*)
! 	echo i386-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     TSUNAMI:LynxOS:2.2*:*)
! 	echo sparc-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     rs6000:LynxOS:2.2*:*)
! 	echo rs6000-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
      RM*:SINIX-*:*:*)
  	echo mips-sni-sysv4
  	exit 0 ;;
-     *:*:*:*:S370)
- 	echo S370-fujitsu-sysv
- 	exit 0 ;;
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
--- 733,772 ----
  	# "miniframe"
  	echo m68010-convergent-sysv
  	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)
! 	OS_REL=''
! 	test -r /etc/.relid \
! 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
! 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
! 	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
! 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
! 	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
!         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && echo i486-ncr-sysv4 && exit 0 ;;
!     m68*:LynxOS:2.*:*)
! 	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
  	exit 0 ;;
!     i?86:LynxOS:2.*:*)
! 	echo i386-unknown-lynxos${UNAME_RELEASE}
! 	exit 0 ;;
!     TSUNAMI:LynxOS:2.*:*)
! 	echo sparc-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
! 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     SM[BE]S:UNIX_SV:*:*)
! 	echo mips-dde-sysv${UNAME_RELEASE}
  	exit 0 ;;
      RM*:SINIX-*:*:*)
  	echo mips-sni-sysv4
  	exit 0 ;;
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
***************
*** 376,387 ****
--- 775,834 ----
  		echo ns32k-sni-sysv
  	fi
  	exit 0 ;;
+     PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                            # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+ 	exit 0 ;;
+     *:*:*:FTX*)
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+ 	exit 0 ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+     news*:NEWS-OS:*:6*)
+ 	echo mips-sony-newsos6
+ 	exit 0 ;;
+     R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+         exit 0 ;;
+     Power*:Rhapsody:*:*)
+         echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Darwin:*:* | *:"Mac OS":*:*)
+ 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ 	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 ;;
  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
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+ # include <sys/utsname.h>
+ #endif
  main ()
  {
  #if defined (sony)
***************
*** 390,396 ****
       I don't know....  */
    printf ("mips-sony-bsd\n"); exit (0);
  #else
!   printf ("m68k-sony-newsos\n"); exit (0);
  #endif
  #endif
  
--- 837,850 ----
       I don't know....  */
    printf ("mips-sony-bsd\n"); exit (0);
  #else
! #include <sys/param.h>
!   printf ("m68k-sony-newsos%s\n",
! #ifdef NEWSOS4
!           "4"
! #else
! 	  ""
! #endif
!          ); exit (0);
  #endif
  #endif
  
***************
*** 408,414 ****
  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
!   printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
    exit (0);
  #endif
  
--- 862,871 ----
  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
!   if (version < 4)
!     printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
!   else
!     printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
    exit (0);
  #endif
  
***************
*** 425,431 ****
  #endif
  
  #if defined (__386BSD__)
!   printf ("i386-unknown-bsd\n"); exit (0);
  #endif
  
  #if defined (sequent)
--- 882,888 ----
  #endif
  
  #if defined (__386BSD__)
!   printf ("i386-pc-bsd\n"); exit (0);
  #endif
  
  #if defined (sequent)
***************
*** 438,444 ****
  #endif
  
  #if defined (_SEQUENT_)
!   printf ("i386-sequent-ptx\n"); exit (0);
  #endif
  
  #if defined (vax)
--- 895,912 ----
  #endif
  
  #if defined (_SEQUENT_)
!     struct utsname un;
! 
!     uname(&un);
! 
!     if (strncmp(un.version, "V2", 2) == 0) {
! 	printf ("i386-sequent-ptx2\n"); exit (0);
!     }
!     if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
! 	printf ("i386-sequent-ptx1\n"); exit (0);
!     }
!     printf ("i386-sequent-ptx\n"); exit (0);
! 
  #endif
  
  #if defined (vax)
diff -rc HDF4.1r4/config.sub HDF4.1r4-osx/config.sub
*** HDF4.1r4/config.sub	Tue May 23 12:03:16 2000
--- HDF4.1r4-osx/config.sub	Thu May  3 15:10:34 2001
***************
*** 1,9 ****
! #!/bin/sh
  # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
! # can handle that machine.  It does not imply ALL GNU software can. 
  #
  # This file is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,9 ----
! #! /bin/sh
  # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
! # can handle that machine.  It does not imply ALL GNU software can.
  #
  # This file is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 17,23 ****
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
--- 17,24 ----
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330,
! # Boston, MA 02111-1307, USA.
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
***************
*** 40,47 ****
--- 41,59 ----
  # The goal of this file is to map all the various variations of a given
  # machine specification into a single specification in the form:
  #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+ # or in some cases, the newer four-part form:
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
  # It is wrong to echo any other type of specification.
  
+ 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
+ 
  # First pass through any local machine types.
  case $1 in
  	*local*)
***************
*** 52,62 ****
  	;;
  esac
  
! # Separate what the user gave into CPU-COMPANY and OS (if any).
! basic_machine=`echo $1 | sed 's/-[^-]*$//'`
! if [ $basic_machine != $1 ]
! then os=`echo $1 | sed 's/.*-/-/'`
! else os=; fi
  
  ### Let's recognize common machines as not being operating systems so
  ### that things like config.sub decstation-3100 work.  We also
--- 64,84 ----
  	;;
  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*)
!     os=-$maybe_os
!     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
!     ;;
!   *)
!     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
!     if [ $basic_machine != $1 ]
!     then os=`echo $1 | sed 's/.*-/-/'`
!     else os=; fi
!     ;;
! esac
  
  ### Let's recognize common machines as not being operating systems so
  ### that things like config.sub decstation-3100 work.  We also
***************
*** 71,110 ****
  	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
! 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
  		os=
  		basic_machine=$1
  		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
  	-sco4)
  		os=-sco3.2v4
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-sco3.2.[4-9]*)
  		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-sco3.2v[4-9]*)
  		# Don't forget version if it is 3.2v4 or newer.
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-sco*)
  		os=-sco3.2v2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-isc)
  		os=-isc2.2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-clix*)
  		basic_machine=clipper-intergraph
  		;;
  	-isc*)
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
! 	-lynx)
  		os=-lynxos
  		;;
  	-ptx*)
--- 93,137 ----
  	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
! 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple)
  		os=
  		basic_machine=$1
  		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
+ 	-sco5)
+ 		os=sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
  	-sco4)
  		os=-sco3.2v4
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco3.2.[4-9]*)
  		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco3.2v[4-9]*)
  		# Don't forget version if it is 3.2v4 or newer.
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco*)
  		os=-sco3.2v2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-isc)
  		os=-isc2.2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-clix*)
  		basic_machine=clipper-intergraph
  		;;
  	-isc*)
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
! 	-lynx*)
  		os=-lynxos
  		;;
  	-ptx*)
***************
*** 113,145 ****
  	-windowsnt*)
  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
  		;;
  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 | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
! 		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
! 		| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
! 		| powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
! 		| pdp11 | mips64el | mips64orion | mips64orionel )
  		basic_machine=$basic_machine-unknown
  		;;
  	# Object if more than one company name word.
  	*-*-*)
  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
! 	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
! 	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* | ia64-* \
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
! 	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
! 	      | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
! 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
! 	      | pdp11-* | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \
! 	      | mips64el-* | mips64orion-* | mips64orionel-* | S370-* )
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
--- 140,188 ----
  	-windowsnt*)
  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
  		;;
+ 	-psos*)
+ 		os=-psos
+ 		;;
  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 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
! 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
! 		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
! 		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
! 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
! 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
! 		| mipstx39 | mipstx39el \
! 		| sparc | sparclet | sparclite | sparc64 | v850)
  		basic_machine=$basic_machine-unknown
  		;;
+ 	# 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[34567]86)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
  	# Object if more than one company name word.
  	*-*-*)
  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
! 	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
! 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
! 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
! 	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
! 	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
! 	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
! 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
! 	      | sparc64-* | mips64-* | mipsel-* \
! 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
! 	      | mipstx39-* | mipstx39el-* \
! 	      | f301-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
***************
*** 166,174 ****
  	amiga | amiga-*)
  		basic_machine=m68k-cbm
  		;;
! 	amigados)
  		basic_machine=m68k-cbm
! 		os=-amigados
  		;;
  	amigaunix | amix)
  		basic_machine=m68k-cbm
--- 209,217 ----
  	amiga | amiga-*)
  		basic_machine=m68k-cbm
  		;;
! 	amigaos | amigados)
  		basic_machine=m68k-cbm
! 		os=-amigaos
  		;;
  	amigaunix | amix)
  		basic_machine=m68k-cbm
***************
*** 178,183 ****
--- 221,230 ----
  		basic_machine=m68k-apollo
  		os=-sysv
  		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+ 		;;
  	balance)
  		basic_machine=ns32k-sequent
  		os=-dynix
***************
*** 210,223 ****
  		basic_machine=cray2-cray
  		os=-unicos
  		;;
! 	c90*)
  		basic_machine=c90-cray
  		os=-unicos
  		;;
- 	cray-t3* | t3* | t3*-cray)
- 		basic_machine=t3e-cray
- 		os=-craympp
- 		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
--- 257,266 ----
  		basic_machine=cray2-cray
  		os=-unicos
  		;;
! 	[ctj]90-cray)
  		basic_machine=c90-cray
  		os=-unicos
  		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
***************
*** 299,323 ****
  	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  		basic_machine=hppa1.0-hp
  		;;
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[3456]86v32)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-sysv32
  		;;
! 	i[3456]86v4*)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-sysv4
  		;;
! 	i[3456]86v)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-sysv
  		;;
! 	i[3456]86sol2)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-solaris2
  		;;
  	iris | iris4d)
--- 342,369 ----
  	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  		basic_machine=hppa1.0-hp
  		;;
+ 	hppa-next)
+ 		os=-nextstep3
+ 		;;
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[34567]86v32)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i[34567]86v4*)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i[34567]86v)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i[34567]86sol2)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
  		;;
  	iris | iris4d)
***************
*** 330,347 ****
  			;;
  		esac
  		;;
- 	irix6_32)
- 		basic_machine=mips-sgi
- 		os=-irix6_32
- 		;;
  	isi68 | isi)
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
- 	j90*)
- 		basic_machine=j90-cray
- 		os=-unicos
- 		;;
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
--- 376,385 ----
***************
*** 356,361 ****
--- 394,407 ----
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
+ 	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/'`
  		;;
***************
*** 423,446 ****
          pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium-*)
! 		# We will change tis to say i586 once there has been
! 		# time for various packages to start to recognize that.
! 		basic_machine=i486-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
  	ps2)
  		basic_machine=i386-ibm
  		;;
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
- 	fujitsu | vp | S370)
- 		basic_machine=vp-fujitsu
- 		os=-sysv
- 		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
--- 469,516 ----
          pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | nexen)
! 		basic_machine=i586-pc
! 		;;
! 	pentiumpro | p6 | k6 | 6x86)
! 		basic_machine=i686-pc
! 		;;
! 	pentiumii | pentium2)
! 		basic_machine=i786-pc
! 		;;
! 	pentium-* | p5-* | k5-* | nexen-*)
! 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
! 		;;
! 	pentiumpro-* | p6-* | k6-* | 6x86-*)
! 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
! 		;;
! 	pentiumii-* | pentium2-*)
! 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
+ 	power)	basic_machine=rs6000-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 	        ;;
+ 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+ 	        ;;
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
  	ps2)
  		basic_machine=i386-ibm
  		;;
+ 	rm[46]00)
+ 		basic_machine=mips-siemens
+ 		;;
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
***************
*** 482,487 ****
--- 552,561 ----
  		basic_machine=sparc-sun
  		os=-sunos4
  		;;
+ 	sun4sol2)
+ 		basic_machine=sparc-sun
+ 		os=-solaris2
+ 		;;
  	sun3 | sun3-*)
  		basic_machine=m68k-sun
  		;;
***************
*** 491,511 ****
  	sun386 | sun386i | roadrunner)
  		basic_machine=i386-sun
  		;;
-   	mac)
- 		basic_machine=m68k-mac
- 		os=-macos
- 		;;
  	symmetry)
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
! 	t90*)
! 		basic_machine=t90-cray
! 		os=-unicos
  		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
  	ultra3)
  		basic_machine=a29k-nyu
  		os=-sym1
--- 565,587 ----
  	sun386 | sun386i | roadrunner)
  		basic_machine=i386-sun
  		;;
  	symmetry)
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
! 	tx39)
! 		basic_machine=mipstx39-unknown
! 		;;
! 	tx39el)
! 		basic_machine=mipstx39el-unknown
  		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
  	ultra3)
  		basic_machine=a29k-nyu
  		os=-sym1
***************
*** 518,523 ****
--- 594,602 ----
  		basic_machine=vax-dec
  		os=-vms
  		;;
+ 	vpp*|vx|vx-*)
+                basic_machine=f301-fujitsu
+                ;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
***************
*** 526,531 ****
--- 605,614 ----
  		basic_machine=m68k-wrs
  		os=-vxworks
  		;;
+ 	vxworks29k)
+ 		basic_machine=a29k-wrs
+ 		os=-vxworks
+ 		;;
  	xmp)
  		basic_machine=xmp-cray
  		os=-unicos
***************
*** 541,547 ****
  # 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.
  	mips)
! 		basic_machine=mips-mips
  		;;
  	romp)
  		basic_machine=romp-ibm
--- 624,634 ----
  # 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.
  	mips)
! 		if [ x$os = x-linux-gnu ]; then
! 			basic_machine=mips-unknown
! 		else
! 			basic_machine=mips-mips
! 		fi
  		;;
  	romp)
  		basic_machine=romp-ibm
***************
*** 593,598 ****
--- 680,687 ----
  if [ x"$os" != x"" ]
  then
  case $os in
+         # First match some system type aliases
+         # that might get confused with valid system types.
  	# -solaris* is a basic system type, with this one exception.
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
***************
*** 600,621 ****
  	-solaris)
  		os=-solaris2
  		;;
  	-gnu/linux*)
! 		os=`echo $os | sed -e 's|gnu/linux|linux|'`
  		;;
  	# First accept the basic system types.
  	# The portable systems comes first.
! 	# Each alternative must end in a *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
! 	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[3456]* \
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigados* | -msdos* | -newsos* | -unicos* | -craympp | -aos* \
! 	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
! 	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
! 	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
! 	      | -ptx* | -coff* | -winnt*)
  		;;
  	-sunos5*)
  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
--- 689,724 ----
  	-solaris)
  		os=-solaris2
  		;;
+ 	-svr4*)
+ 		os=-sysv4
+ 		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
  	-gnu/linux*)
! 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  		;;
  	# First accept the basic system types.
  	# The portable systems comes first.
! 	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
! 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
! 	      | -aos* \
! 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
! 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
! 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
! 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
! 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! 	      | -mingw32* | -linux-gnu* | -uxpv* | -openstep* | -rhapsody* | -darwin* | -beos*)
! 	# Remember, each alternative MUST END IN *, to match a version number.
! 		;;
! 	-linux*)
! 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  		;;
  	-sunos5*)
  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
***************
*** 641,646 ****
--- 744,759 ----
  	-ctix* | -uts*)
  		os=-sysv
  		;;
+ 	-ns2 )
+ 	        os=-nextstep2
+ 		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+ 		;;
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
  	-triton*)
  		os=-sysv3
  		;;
***************
*** 662,670 ****
  	-xenix)
  		os=-xenix
  		;;
-   	-macos)
- 		os=-macos
- 		;;
  	-none)
  		;;
  	*)
--- 775,780 ----
***************
*** 690,701 ****
--- 800,817 ----
  	*-acorn)
  		os=-riscix1.2
  		;;
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
          pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
  		os=-ultrix4.2
  		;;
+ 	m68*-apollo)
+ 		os=-domain
+ 		;;
  	i386-sun)
  		os=-sunos4.0.2
  		;;
***************
*** 711,716 ****
--- 827,835 ----
  	sparc-* | *-sun)
  		os=-sunos4.1.1
  		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
  	*-ibm)
  		os=-aix
  		;;
***************
*** 724,730 ****
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigados
  		;;
  	*-dg)
  		os=-dgux
--- 843,849 ----
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigaos
  		;;
  	*-dg)
  		os=-dgux
***************
*** 738,743 ****
--- 857,865 ----
  	m88k-omron*)
  		os=-luna
  		;;
+ 	*-next )
+ 		os=-nextstep
+ 		;;
  	*-sequent)
  		os=-ptx
  		;;
***************
*** 765,773 ****
--- 887,901 ----
          *-sgi)
  		os=-irix
  		;;
+         *-siemens)
+ 		os=-sysv4
+ 		;;
  	*-masscomp)
  		os=-rtu
  		;;
+ 	f301-fujitsu)
+ 		os=-uxpv
+ 		;;
  	*)
  		os=-none
  		;;
***************
*** 786,794 ****
  			-sunos*)
  				vendor=sun
  				;;
- 			-lynxos*)
- 				vendor=lynx
- 				;;
  			-aix*)
  				vendor=ibm
  				;;
--- 914,919 ----
***************
*** 813,823 ****
  			-mvs*)
  				vendor=ibm
  				;;
-           -macos*)
-                vendor=apple
- 				;;
  			-ptx*)
  				vendor=sequent
  				;;
  		esac
  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
--- 938,951 ----
  			-mvs*)
  				vendor=ibm
  				;;
  			-ptx*)
  				vendor=sequent
+ 				;;
+ 			-vxsim* | -vxworks*)
+ 				vendor=wrs
+ 				;;
+ 			-aux*)
+ 				vendor=apple
  				;;
  		esac
  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
diff -rc HDF4.1r4/configure.in HDF4.1r4-osx/configure.in
*** HDF4.1r4/configure.in	Wed Aug 30 12:41:09 2000
--- HDF4.1r4-osx/configure.in	Thu May  3 22:37:25 2001
***************
*** 93,98 ****
--- 93,99 ----
    *-cray-unicos*)         host_makefile_frag=config/mh-unicos ;;
    t3*-cray-craympp)       host_makefile_frag=config/mh-t3e ;;
    S370-fujitsu-sysv*)     host_makefile_frag=config/mh-fujivp ;;
+   *-apple-darwin*)	  host_makefile_frag=config/mh-darwin ;;
    *-mac-*)                host_makefile_frag=config/mh-mac ;;
  esac
  fi
***************
*** 167,172 ****
--- 168,174 ----
    *-cray-unicos*)         files="mfhdf/libsrc/config/netcdf-unicos.h mfhdf/fortran/config/jackets-unicos.c mfhdf/fortran/config/netcdf-unicos.inc mfhdf/fortran/config/ftest-unicos.f" ;;
    t3*-cray-craympp)       files="mfhdf/libsrc/config/netcdf-t3e.h mfhdf/fortran/config/jackets-t3e.c mfhdf/fortran/config/netcdf-t3e.inc mfhdf/fortran/config/ftest-t3e.f" ;;
    S370-fujitsu-sysv*)     files="mfhdf/libsrc/config/netcdf-fujivp.h mfhdf/fortran/config/jackets-fujivp.c mfhdf/fortran/config/netcdf-fujivp.inc mfhdf/fortran/config/ftest-fujivp.f" ;;
+   *-apple-darwin*)	  files="mfhdf/libsrc/config/netcdf-darwin.h mfhdf/fortran/config/jackets-darwin.c mfhdf/fortran/config/netcdf-darwin.inc mfhdf/fortran/config/ftest-darwin.f" ;;
    *-mac-*)		          files="mfhdf/libsrc/config/netcdf-mac.h mfhdf/fortran/config/jackets-mac.c mfhdf/fortran/config/netcdf-mac.inc mfhdf/fortran/config/ftest-mac.f" ;;
  esac
  fi
Only in HDF4.1r4-osx/hdf/fmpool/config: fmpdarwin.h
Only in HDF4.1r4-osx/hdf/fmpool/config: mh-darwin
diff -rc HDF4.1r4/hdf/fmpool/config.guess HDF4.1r4-osx/hdf/fmpool/config.guess
*** HDF4.1r4/hdf/fmpool/config.guess	Sat Apr 17 10:34:55 1999
--- HDF4.1r4-osx/hdf/fmpool/config.guess	Thu May  3 15:23:10 2001
***************
*** 1,6 ****
! #!/bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
  #
  # 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
--- 1,6 ----
! #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
  #
  # 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
***************
*** 14,20 ****
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
--- 14,20 ----
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
***************
*** 45,80 ****
  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- UNAME_PROCESSOR=`(uname -p) 2>/dev/null` || UNAME_PROCESSOR=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}:${UNAME_PROCESSOR}" in
!     alpha:OSF1:V*:*)
! 	# After 1.2, OSF1 uses "V1.3" for uname -r.
! 	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
! 	exit 0 ;;
      alpha:OSF1:*:*)
  	# 1.2 uses "1.2" for uname -r.
! 	echo alpha-dec-osf${UNAME_RELEASE}
!         exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit 0;;
!     Pyramid*:OSx*:*:*)
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
  		echo pyramid-pyramid-sysv3
  	else
  		echo pyramid-pyramid-bsd
  	fi
  	exit 0 ;;
!     sun4*:SunOS:5.*:*)
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
!     i86pc*:SunOS:*:*)
! 	echo i386-sun-solaris2${UNAME_RELEASE}
  	exit 0 ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
--- 45,166 ----
  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
  trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
  
  # Note: order is significant - the case branches are not exclusive.
  
! case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      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.
! 	cat <<EOF >dummy.s
! 	.globl main
! 	.ent main
! main:
! 	.frame \$30,0,\$26,0
! 	.prologue 0
! 	.long 0x47e03d80 # implver $0
! 	lda \$2,259
! 	.long 0x47e20c21 # amask $2,$1
! 	srl \$1,8,\$2
! 	sll \$2,2,\$2
! 	sll \$0,3,\$0
! 	addl \$1,\$0,\$0
! 	addl \$2,\$0,\$0
! 	ret \$31,(\$26),1
! 	.end main
! EOF
! 	${CC-cc} dummy.s -o dummy 2>/dev/null
! 	if test "$?" = 0 ; then
! 		./dummy
! 		case "$?" in
! 			7)
! 				UNAME_MACHINE="alpha"
! 				;;
! 			15)
! 				UNAME_MACHINE="alphaev5"
! 				;;
! 			14)
! 				UNAME_MACHINE="alphaev56"
! 				;;
! 			10)
! 				UNAME_MACHINE="alphapca56"
! 				;;
! 			16)
! 				UNAME_MACHINE="alphaev6"
! 				;;
! 		esac
! 	fi
! 	rm -f dummy.s dummy
! 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
! 	exit 0 ;;
!     21064:Windows_NT:50:3)
! 	echo alpha-dec-winnt3.5
! 	exit 0 ;;
!     Amiga*:UNIX_System_V:4.0:*)
! 	echo m68k-cbm-sysv4
! 	exit 0;;
!     amiga:NetBSD:*:*)
!       echo m68k-cbm-netbsd${UNAME_RELEASE}
!       exit 0 ;;
!     amiga:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     *:[Aa]miga[Oo][Ss]:*:*)
! 	echo ${UNAME_MACHINE}-unknown-amigaos
! 	exit 0 ;;
!     arc64:OpenBSD:*:*)
! 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     arc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     hkmips:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     pmax:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     sgi:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     wgrisc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit 0;;
!     arm32:NetBSD:*:*)
! 	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
! 	exit 0 ;;
!     SR2?01:HI-UX/MPP:*:*)
! 	echo hppa1.1-hitachi-hiuxmpp
! 	exit 0;;
!     Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
! 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
  		echo pyramid-pyramid-sysv3
  	else
  		echo pyramid-pyramid-bsd
  	fi
  	exit 0 ;;
!     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 ;;
!     i86pc:SunOS:5.*:*)
! 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
***************
*** 83,103 ****
  	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      sun4*:SunOS:*:*)
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
  	exit 0 ;;
      sun3*:SunOS:*:*)
  	echo m68k-sun-sunos${UNAME_RELEASE}
  	exit 0 ;;
      RISC*:ULTRIX:*:*)
  	echo mips-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
      VAX*:ULTRIX*:*:*)
  	echo vax-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
!     mips:*:5*:RISCos)
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
      m88k:CX/UX:7*:*)
  	echo m88k-harris-cxux7
  	exit 0 ;;
--- 169,268 ----
  	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+ 	    Series*|S4*)
+ 		UNAME_RELEASE=`uname -v`
+ 		;;
+ 	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
  	exit 0 ;;
      sun3*:SunOS:*:*)
  	echo m68k-sun-sunos${UNAME_RELEASE}
  	exit 0 ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(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-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun3*:NetBSD:*:*)
+ 	echo m68k-sun-netbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun3*:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mac68k:NetBSD:*:*)
+ 	echo m68k-apple-netbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme88k:OpenBSD:*:*)
+ 	echo m88k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+     macppc:NetBSD:*:*)
+         echo powerpc-apple-netbsd${UNAME_RELEASE}
+         exit 0 ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit 0 ;;
      RISC*:ULTRIX:*:*)
  	echo mips-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
      VAX*:ULTRIX*:*:*)
  	echo vax-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
!     2020: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; {
! 	#if defined (host_mips) && defined (MIPSEB)
! 	#if defined (SYSTYPE_SYSV)
! 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
! 	#endif
! 	#if defined (SYSTYPE_SVR4)
! 	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
! 	#endif
! 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
! 	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
! 	#endif
! 	#endif
! 	  exit (-1);
! 	}
! EOF
! 	${CC-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
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
      m88k:CX/UX:7*:*)
  	echo m88k-harris-cxux7
  	exit 0 ;;
***************
*** 108,119 ****
--- 273,289 ----
  	echo m88k-motorola-sysv3
  	exit 0 ;;
      AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+         if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
  	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
  	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
  		echo m88k-dg-dgux${UNAME_RELEASE}
  	else
  		echo m88k-dg-dguxbcs${UNAME_RELEASE}
  	fi
+         else echo i586-dg-dgux${UNAME_RELEASE}
+         fi
   	exit 0 ;;
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
***************
*** 129,137 ****
  	echo m68k-tektronix-bsd
  	exit 0 ;;
      *:IRIX*:*:*)
! 	echo mips-sgi-irix${UNAME_RELEASE}
  	exit 0 ;;
!     i[34]86:AIX:*:*)
  	echo i386-ibm-aix
  	exit 0 ;;
      *:AIX:2:3)
--- 299,310 ----
  	echo m68k-tektronix-bsd
  	exit 0 ;;
      *:IRIX*:*:*)
! 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
  	exit 0 ;;
!     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
! 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
! 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
!     i?86:AIX:*:*)
  	echo i386-ibm-aix
  	exit 0 ;;
      *:AIX:2:3)
***************
*** 157,171 ****
  	fi
  	exit 0 ;;
      *:AIX:*:4)
! 	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
  		IBM_ARCH=powerpc
  	fi
! 	if grep bos410 /usr/include/stdio.h >/dev/null 2>&1; then
! 		IBM_REV=4.1
! 	elif grep bos411 /usr/include/stdio.h >/dev/null 2>&1; then
! 		IBM_REV=4.1.1
  	else
  		IBM_REV=4.${UNAME_RELEASE}
  	fi
--- 330,343 ----
  	fi
  	exit 0 ;;
      *:AIX:*:4)
! 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
! 	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
  		IBM_ARCH=powerpc
  	fi
! 	if [ -x /usr/bin/oslevel ] ; then
! 		IBM_REV=`/usr/bin/oslevel`
  	else
  		IBM_REV=4.${UNAME_RELEASE}
  	fi
***************
*** 174,179 ****
--- 346,357 ----
      *:AIX:*:*)
  	echo rs6000-ibm-aix
  	exit 0 ;;
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
      *:BOSX:*:*)
  	echo rs6000-bull-bosx
  	exit 0 ;;
***************
*** 186,197 ****
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
  	echo m68k-hp-bsd4.4
  	exit 0 ;;
!     9000/[3478]??:HP-UX:*:*)
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
! 	    9000/7?? | 9000/8?7 ) HP_ARCH=hppa1.1 ;;
! 	    9000/8?? )            HP_ARCH=hppa1.0 ;;
  	esac
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--- 364,407 ----
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
  	echo m68k-hp-bsd4.4
  	exit 0 ;;
!     9000/[34678]??:HP-UX:*:*)
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
! 	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
!               sed 's/^              //' << EOF >dummy.c
!               #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
! 	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
! 	rm -f dummy.c dummy
  	esac
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
***************
*** 226,243 ****
  	rm -f dummy.c dummy
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
!     9000/7??:4.3bsd:*:* | 9000/8?7:4.3bsd:*:* )
  	echo hppa1.1-hp-bsd
  	exit 0 ;;
      9000/8??:4.3bsd:*:*)
  	echo hppa1.0-hp-bsd
  	exit 0 ;;
!     hp7??:OSF1:*:* | hp8?7:OSF1:*:* )
  	echo hppa1.1-hp-osf
  	exit 0 ;;
      hp8??:OSF1:*:*)
  	echo hppa1.0-hp-osf
  	exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
          exit 0 ;;
--- 436,463 ----
  	rm -f dummy.c dummy
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
!     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
  	echo hppa1.1-hp-bsd
  	exit 0 ;;
      9000/8??:4.3bsd:*:*)
  	echo hppa1.0-hp-bsd
  	exit 0 ;;
!     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
  	echo hppa1.1-hp-osf
  	exit 0 ;;
      hp8??:OSF1:*:*)
  	echo hppa1.0-hp-osf
  	exit 0 ;;
+     i?86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+ 	exit 0 ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+ 	exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
          exit 0 ;;
***************
*** 260,287 ****
  	echo xmp-cray-unicos
          exit 0 ;;
      CRAY*Y-MP:*:*:*)
! 	echo ymp-cray-unicos
!         exit 0 ;;
      CRAY-2:*:*:*)
  	echo cray2-cray-unicos
          exit 0 ;;
!     CRAY*C90:c90:*:*)
! 	echo c90-cray-unicos
!         exit 0 ;;
!     CRAY*J90:*:*:*)
! 	echo j90-cray-unicos
!         exit 0 ;;
!     CRAY*TS:*:*:*)
!         echo t90-cray-unicos
!         exit 0 ;;
!     CRAY*T3*:*:*:*)
!         echo t3e-cray-craympp
!         exit 0 ;;
      hp3[0-9][05]:NetBSD:*:*)
  	echo m68k-hp-netbsd${UNAME_RELEASE}
  	exit 0 ;;
!     i[34]86:BSD/386:*:*)
! 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--- 480,517 ----
  	echo xmp-cray-unicos
          exit 0 ;;
      CRAY*Y-MP:*:*:*)
! 	echo ymp-cray-unicos${UNAME_RELEASE}
! 	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/
! 	exit 0 ;;
!     CRAY*TS:*:*:*)
! 	echo t90-cray-unicos${UNAME_RELEASE}
! 	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/\///'`
!         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
!         echo "f300-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}
  	exit 0 ;;
!     hp300:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     sparc*:BSD/OS:*:*)
! 	echo sparc-unknown-bsdi${UNAME_RELEASE}
! 	exit 0 ;;
!     i?86:BSD/386:*:* | *:BSD/OS:*:*)
! 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
***************
*** 289,326 ****
      *:NetBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	exit 0 ;;
      *:GNU:*:*)
! 	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit 0 ;;
      *:Linux:*:*)
! 	echo ${UNAME_MACHINE}-unknown-linux
! 	exit 0 ;;
  # 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[34]86:DYNIX/ptx:4*:*)
  	echo i386-sequent-sysv4
  	exit 0 ;;
!     i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
  	else
! 		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
  	fi
  	exit 0 ;;
!     i[34]86:*:3.2:*)
! 	if /bin/uname -X 2>/dev/null >/dev/null ; then
  		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
  		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
! 		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
! 	elif test -f /usr/options/cb.name; then
! 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
! 		echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
  	else
! 		echo ${UNAME_MACHINE}-unknown-sysv32
  	fi
  	exit 0 ;;
      Intel:Mach:3*:*)
! 	echo i386-unknown-mach3
  	exit 0 ;;
      i860:*:4.*:*) # i860-SVR4
  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
--- 519,726 ----
      *:NetBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit 0 ;;
+     i*:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit 0 ;;
+     p*:CYGWIN*:*)
+ 	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,/.*$,,'`
  	exit 0 ;;
      *:Linux:*:*)
! 	# uname on the ARM produces all sorts of strangeness, and we need to
! 	# filter it out.
! 	case "$UNAME_MACHINE" in
! 	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
! 	esac
! 
! 	# 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`
! 	ld_supported_emulations=`echo $ld_help_string \
! 			 | sed -ne '/supported emulations:/!d
! 				    s/[ 	][ 	]*/ /g
! 				    s/.*supported emulations: *//
! 				    s/ .*//
! 				    p'`
!         case "$ld_supported_emulations" in
! 	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
! 	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
! 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
! 	esac
! 
! 	if test "${UNAME_MACHINE}" = "alpha" ; then
! 		sed 's/^	//'  <<EOF >dummy.s
! 		.globl main
! 		.ent main
! 	main:
! 		.frame \$30,0,\$26,0
! 		.prologue 0
! 		.long 0x47e03d80 # implver $0
! 		lda \$2,259
! 		.long 0x47e20c21 # amask $2,$1
! 		srl \$1,8,\$2
! 		sll \$2,2,\$2
! 		sll \$0,3,\$0
! 		addl \$1,\$0,\$0
! 		addl \$2,\$0,\$0
! 		ret \$31,(\$26),1
! 		.end main
! EOF
! 		LIBC=""
! 		${CC-cc} dummy.s -o dummy 2>/dev/null
! 		if test "$?" = 0 ; then
! 			./dummy
! 			case "$?" in
! 			7)
! 				UNAME_MACHINE="alpha"
! 				;;
! 			15)
! 				UNAME_MACHINE="alphaev5"
! 				;;
! 			14)
! 				UNAME_MACHINE="alphaev56"
! 				;;
! 			10)
! 				UNAME_MACHINE="alphapca56"
! 				;;
! 			16)
! 				UNAME_MACHINE="alphaev6"
! 				;;
! 			esac	
! 
! 			objdump --private-headers dummy | \
! 			  grep ld.so.1 > /dev/null
! 			if test "$?" = 0 ; then
! 				LIBC="libc1"
! 			fi
! 		fi	
! 		rm -f dummy.s dummy
! 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
! 	elif test "${UNAME_MACHINE}" = "mips" ; then
! 	  cat >dummy.c <<EOF
! main(argc, argv)
!      int argc;
!      char *argv[];
! {
! #ifdef __MIPSEB__
!   printf ("%s-unknown-linux-gnu\n", argv[1]);
! #endif
! #ifdef __MIPSEL__
!   printf ("%sel-unknown-linux-gnu\n", argv[1]);
! #endif
!   return 0;
! }
! EOF
! 	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
! 	  rm -f dummy.c dummy
! 	else
! 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
! 	  # or one that does not give us useful --help.
! 	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
! 	  # If ld does not provide *any* "supported emulations:"
! 	  # that means it is gnuoldld.
! 	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
! 	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
! 
! 	  case "${UNAME_MACHINE}" in
! 	  i?86)
! 	    VENDOR=pc;
! 	    ;;
! 	  *)
! 	    VENDOR=unknown;
! 	    ;;
! 	  esac
! 	  # Determine whether the default compiler is a.out or elf
! 	  cat >dummy.c <<EOF
! #include <features.h>
! main(argc, argv)
!      int argc;
!      char *argv[];
! {
! #ifdef __ELF__
! # ifdef __GLIBC__
! #  if __GLIBC__ >= 2
!     printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
! #  else
!     printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! #  endif
! # else
!    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! # endif
! #else
!   printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
! #endif
!   return 0;
! }
! EOF
! 	  ${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*:*)
  	echo i386-sequent-sysv4
  	exit 0 ;;
!     i?86:UNIX_SV:4.2MP:2.*)
!         # Unixware is an offshoot of SVR4, but it has its own version
!         # number series starting with 2...
!         # I am not positive that other SVR4 systems won't match this,
! 	# I just have to hope.  -- rms.
!         # Use sysv4.2uw... so that sysv4* matches it.
! 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
! 	exit 0 ;;
!     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
  	else
! 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
  	fi
  	exit 0 ;;
!     i?86:*:3.2:*)
! 	if test -f /usr/options/cb.name; then
! 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
! 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
! 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
  		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
  		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
! 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
! 			&& UNAME_MACHINE=i586
! 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  	else
! 		echo ${UNAME_MACHINE}-pc-sysv32
! 	fi
! 	exit 0 ;;
!     i?86:UnixWare:*:*)
! 	if /bin/uname -X 2>/dev/null >/dev/null ; then
! 	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
! 	    && UNAME_MACHINE=i586
  	fi
+ 	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
  	exit 0 ;;
+     pc:*:*:*)
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+         exit 0 ;;
      Intel:Mach:3*:*)
! 	echo i386-pc-mach3
! 	exit 0 ;;
!     paragon:*:*:*)
! 	echo i860-intel-osf1
  	exit 0 ;;
      i860:*:4.*:*) # i860-SVR4
  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
***************
*** 333,367 ****
  	# "miniframe"
  	echo m68010-convergent-sysv
  	exit 0 ;;
!     M680[234]0:*:R3V[567]*:*)
  	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
!     3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
!         uname -p 2>/dev/null | grep 86 >/dev/null \
!           && echo i486-ncr-sysv4.3 && exit 0 ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
!         uname -p 2>/dev/null | grep 86 >/dev/null \
            && echo i486-ncr-sysv4 && exit 0 ;;
!     m680[234]0:LynxOS:2.2*:*)
! 	echo m68k-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
  	exit 0 ;;
!     i[34]86:LynxOS:2.2*:*)
! 	echo i386-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     TSUNAMI:LynxOS:2.2*:*)
! 	echo sparc-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     rs6000:LynxOS:2.2*:*)
! 	echo rs6000-lynx-lynxos${UNAME_RELEASE}
  	exit 0 ;;
      RM*:SINIX-*:*:*)
  	echo mips-sni-sysv4
  	exit 0 ;;
-     *:*:*:*:S370)
-         echo S370-fujitsu-sysv
-         exit 0 ;;
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
--- 733,772 ----
  	# "miniframe"
  	echo m68010-convergent-sysv
  	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)
! 	OS_REL=''
! 	test -r /etc/.relid \
! 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
! 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
! 	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
! 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
! 	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
!         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && echo i486-ncr-sysv4 && exit 0 ;;
!     m68*:LynxOS:2.*:*)
! 	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
  	exit 0 ;;
!     i?86:LynxOS:2.*:*)
! 	echo i386-unknown-lynxos${UNAME_RELEASE}
! 	exit 0 ;;
!     TSUNAMI:LynxOS:2.*:*)
! 	echo sparc-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
! 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
!     SM[BE]S:UNIX_SV:*:*)
! 	echo mips-dde-sysv${UNAME_RELEASE}
  	exit 0 ;;
      RM*:SINIX-*:*:*)
  	echo mips-sni-sysv4
  	exit 0 ;;
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
***************
*** 370,381 ****
--- 775,834 ----
  		echo ns32k-sni-sysv
  	fi
  	exit 0 ;;
+     PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                            # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+ 	exit 0 ;;
+     *:*:*:FTX*)
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+ 	exit 0 ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+     news*:NEWS-OS:*:6*)
+ 	echo mips-sony-newsos6
+ 	exit 0 ;;
+     R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+         exit 0 ;;
+     Power*:Rhapsody:*:*)
+         echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Darwin:*:* | *:"Mac OS":*:*)
+ 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ 	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 ;;
  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
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+ # include <sys/utsname.h>
+ #endif
  main ()
  {
  #if defined (sony)
***************
*** 384,390 ****
       I don't know....  */
    printf ("mips-sony-bsd\n"); exit (0);
  #else
!   printf ("m68k-sony-newsos\n"); exit (0);
  #endif
  #endif
  
--- 837,850 ----
       I don't know....  */
    printf ("mips-sony-bsd\n"); exit (0);
  #else
! #include <sys/param.h>
!   printf ("m68k-sony-newsos%s\n",
! #ifdef NEWSOS4
!           "4"
! #else
! 	  ""
! #endif
!          ); exit (0);
  #endif
  #endif
  
***************
*** 402,408 ****
  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
!   printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
    exit (0);
  #endif
  
--- 862,871 ----
  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
!   if (version < 4)
!     printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
!   else
!     printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
    exit (0);
  #endif
  
***************
*** 419,425 ****
  #endif
  
  #if defined (__386BSD__)
!   printf ("i386-unknown-bsd\n"); exit (0);
  #endif
  
  #if defined (sequent)
--- 882,888 ----
  #endif
  
  #if defined (__386BSD__)
!   printf ("i386-pc-bsd\n"); exit (0);
  #endif
  
  #if defined (sequent)
***************
*** 432,438 ****
  #endif
  
  #if defined (_SEQUENT_)
!   printf ("i386-sequent-ptx\n"); exit (0);
  #endif
  
  #if defined (vax)
--- 895,912 ----
  #endif
  
  #if defined (_SEQUENT_)
!     struct utsname un;
! 
!     uname(&un);
! 
!     if (strncmp(un.version, "V2", 2) == 0) {
! 	printf ("i386-sequent-ptx2\n"); exit (0);
!     }
!     if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
! 	printf ("i386-sequent-ptx1\n"); exit (0);
!     }
!     printf ("i386-sequent-ptx\n"); exit (0);
! 
  #endif
  
  #if defined (vax)
diff -rc HDF4.1r4/hdf/fmpool/config.sub HDF4.1r4-osx/hdf/fmpool/config.sub
*** HDF4.1r4/hdf/fmpool/config.sub	Tue May 23 12:03:23 2000
--- HDF4.1r4-osx/hdf/fmpool/config.sub	Thu May  3 15:23:15 2001
***************
*** 1,9 ****
! #!/bin/sh
  # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
! # can handle that machine.  It does not imply ALL GNU software can. 
  #
  # This file is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,9 ----
! #! /bin/sh
  # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
! # can handle that machine.  It does not imply ALL GNU software can.
  #
  # This file is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 17,23 ****
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
--- 17,24 ----
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330,
! # Boston, MA 02111-1307, USA.
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
***************
*** 40,47 ****
--- 41,59 ----
  # The goal of this file is to map all the various variations of a given
  # machine specification into a single specification in the form:
  #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+ # or in some cases, the newer four-part form:
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
  # It is wrong to echo any other type of specification.
  
+ 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
+ 
  # First pass through any local machine types.
  case $1 in
  	*local*)
***************
*** 52,62 ****
  	;;
  esac
  
! # Separate what the user gave into CPU-COMPANY and OS (if any).
! basic_machine=`echo $1 | sed 's/-[^-]*$//'`
! if [ $basic_machine != $1 ]
! then os=`echo $1 | sed 's/.*-/-/'`
! else os=; fi
  
  ### Let's recognize common machines as not being operating systems so
  ### that things like config.sub decstation-3100 work.  We also
--- 64,84 ----
  	;;
  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*)
!     os=-$maybe_os
!     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
!     ;;
!   *)
!     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
!     if [ $basic_machine != $1 ]
!     then os=`echo $1 | sed 's/.*-/-/'`
!     else os=; fi
!     ;;
! esac
  
  ### Let's recognize common machines as not being operating systems so
  ### that things like config.sub decstation-3100 work.  We also
***************
*** 71,110 ****
  	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
! 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
  		os=
  		basic_machine=$1
  		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
  	-sco4)
  		os=-sco3.2v4
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-sco3.2.[4-9]*)
  		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-sco3.2v[4-9]*)
  		# Don't forget version if it is 3.2v4 or newer.
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-sco*)
  		os=-sco3.2v2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-isc)
  		os=-isc2.2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
  	-clix*)
  		basic_machine=clipper-intergraph
  		;;
  	-isc*)
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
  		;;
! 	-lynx)
  		os=-lynxos
  		;;
  	-ptx*)
--- 93,137 ----
  	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
! 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple)
  		os=
  		basic_machine=$1
  		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
+ 	-sco5)
+ 		os=sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
  	-sco4)
  		os=-sco3.2v4
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco3.2.[4-9]*)
  		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco3.2v[4-9]*)
  		# Don't forget version if it is 3.2v4 or newer.
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco*)
  		os=-sco3.2v2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-isc)
  		os=-isc2.2
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-clix*)
  		basic_machine=clipper-intergraph
  		;;
  	-isc*)
! 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
! 	-lynx*)
  		os=-lynxos
  		;;
  	-ptx*)
***************
*** 113,145 ****
  	-windowsnt*)
  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
  		;;
  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 | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
! 		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
! 		| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
! 		| powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
! 		| pdp11 | mips64el | mips64orion | mips64orionel )
  		basic_machine=$basic_machine-unknown
  		;;
  	# Object if more than one company name word.
  	*-*-*)
  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
! 	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
! 	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* | ia64-* \
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
! 	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
! 	      | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
! 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
! 	      | pdp11-* | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \
! 	      | mips64el-* | mips64orion-* | mips64orionel-* | S370-* )
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
--- 140,188 ----
  	-windowsnt*)
  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
  		;;
+ 	-psos*)
+ 		os=-psos
+ 		;;
  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 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
! 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
! 		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
! 		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
! 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
! 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
! 		| mipstx39 | mipstx39el \
! 		| sparc | sparclet | sparclite | sparc64 | v850)
  		basic_machine=$basic_machine-unknown
  		;;
+ 	# 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[34567]86)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
  	# Object if more than one company name word.
  	*-*-*)
  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
! 	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
! 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
! 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
! 	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
! 	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
! 	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
! 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
! 	      | sparc64-* | mips64-* | mipsel-* \
! 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
! 	      | mipstx39-* | mipstx39el-* \
! 	      | f301-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
***************
*** 166,174 ****
  	amiga | amiga-*)
  		basic_machine=m68k-cbm
  		;;
! 	amigados)
  		basic_machine=m68k-cbm
! 		os=-amigados
  		;;
  	amigaunix | amix)
  		basic_machine=m68k-cbm
--- 209,217 ----
  	amiga | amiga-*)
  		basic_machine=m68k-cbm
  		;;
! 	amigaos | amigados)
  		basic_machine=m68k-cbm
! 		os=-amigaos
  		;;
  	amigaunix | amix)
  		basic_machine=m68k-cbm
***************
*** 178,183 ****
--- 221,230 ----
  		basic_machine=m68k-apollo
  		os=-sysv
  		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+ 		;;
  	balance)
  		basic_machine=ns32k-sequent
  		os=-dynix
***************
*** 210,223 ****
  		basic_machine=cray2-cray
  		os=-unicos
  		;;
! 	c90*)
  		basic_machine=c90-cray
  		os=-unicos
  		;;
- 	cray-t3* | t3* | t3*-cray)
- 		basic_machine=t3e-cray
- 		os=-craympp
- 		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
--- 257,266 ----
  		basic_machine=cray2-cray
  		os=-unicos
  		;;
! 	[ctj]90-cray)
  		basic_machine=c90-cray
  		os=-unicos
  		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
***************
*** 299,323 ****
  	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  		basic_machine=hppa1.0-hp
  		;;
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[3456]86v32)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-sysv32
  		;;
! 	i[3456]86v4*)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-sysv4
  		;;
! 	i[3456]86v)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-sysv
  		;;
! 	i[3456]86sol2)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
  		os=-solaris2
  		;;
  	iris | iris4d)
--- 342,369 ----
  	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  		basic_machine=hppa1.0-hp
  		;;
+ 	hppa-next)
+ 		os=-nextstep3
+ 		;;
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[34567]86v32)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i[34567]86v4*)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i[34567]86v)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i[34567]86sol2)
! 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
  		;;
  	iris | iris4d)
***************
*** 330,347 ****
  			;;
  		esac
  		;;
- 	irix6_32)
- 		basic_machine=mips-sgi
- 		os=-irix6_32
- 		;;
  	isi68 | isi)
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
- 	j90*)
- 		basic_machine=j90-cray
- 		os=-unicos
- 		;;
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
--- 376,385 ----
***************
*** 356,361 ****
--- 394,407 ----
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
+ 	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/'`
  		;;
***************
*** 423,446 ****
          pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium-*)
! 		# We will change tis to say i586 once there has been
! 		# time for various packages to start to recognize that.
! 		basic_machine=i486-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
  	ps2)
  		basic_machine=i386-ibm
  		;;
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
- 	fujitsu | vp | S370)
- 		basic_machine=vp-fujitsu
- 		os=-sysv
- 		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
--- 469,516 ----
          pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | nexen)
! 		basic_machine=i586-pc
! 		;;
! 	pentiumpro | p6 | k6 | 6x86)
! 		basic_machine=i686-pc
! 		;;
! 	pentiumii | pentium2)
! 		basic_machine=i786-pc
! 		;;
! 	pentium-* | p5-* | k5-* | nexen-*)
! 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
! 		;;
! 	pentiumpro-* | p6-* | k6-* | 6x86-*)
! 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
! 		;;
! 	pentiumii-* | pentium2-*)
! 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
+ 	power)	basic_machine=rs6000-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 	        ;;
+ 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+ 	        ;;
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
  	ps2)
  		basic_machine=i386-ibm
  		;;
+ 	rm[46]00)
+ 		basic_machine=mips-siemens
+ 		;;
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
***************
*** 482,487 ****
--- 552,561 ----
  		basic_machine=sparc-sun
  		os=-sunos4
  		;;
+ 	sun4sol2)
+ 		basic_machine=sparc-sun
+ 		os=-solaris2
+ 		;;
  	sun3 | sun3-*)
  		basic_machine=m68k-sun
  		;;
***************
*** 491,511 ****
  	sun386 | sun386i | roadrunner)
  		basic_machine=i386-sun
  		;;
-   	mac)
- 		basic_machine=m68k-mac
- 		os=-macos
- 		;;
  	symmetry)
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
!         t90*)
!                 basic_machine=t90-cray
!                 os=-unicos
!                 ;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
  	ultra3)
  		basic_machine=a29k-nyu
  		os=-sym1
--- 565,587 ----
  	sun386 | sun386i | roadrunner)
  		basic_machine=i386-sun
  		;;
  	symmetry)
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
! 	tx39)
! 		basic_machine=mipstx39-unknown
! 		;;
! 	tx39el)
! 		basic_machine=mipstx39el-unknown
! 		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
  	ultra3)
  		basic_machine=a29k-nyu
  		os=-sym1
***************
*** 518,523 ****
--- 594,602 ----
  		basic_machine=vax-dec
  		os=-vms
  		;;
+ 	vpp*|vx|vx-*)
+                basic_machine=f301-fujitsu
+                ;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
***************
*** 526,531 ****
--- 605,614 ----
  		basic_machine=m68k-wrs
  		os=-vxworks
  		;;
+ 	vxworks29k)
+ 		basic_machine=a29k-wrs
+ 		os=-vxworks
+ 		;;
  	xmp)
  		basic_machine=xmp-cray
  		os=-unicos
***************
*** 541,547 ****
  # 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.
  	mips)
! 		basic_machine=mips-mips
  		;;
  	romp)
  		basic_machine=romp-ibm
--- 624,634 ----
  # 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.
  	mips)
! 		if [ x$os = x-linux-gnu ]; then
! 			basic_machine=mips-unknown
! 		else
! 			basic_machine=mips-mips
! 		fi
  		;;
  	romp)
  		basic_machine=romp-ibm
***************
*** 593,598 ****
--- 680,687 ----
  if [ x"$os" != x"" ]
  then
  case $os in
+         # First match some system type aliases
+         # that might get confused with valid system types.
  	# -solaris* is a basic system type, with this one exception.
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
***************
*** 600,621 ****
  	-solaris)
  		os=-solaris2
  		;;
  	-gnu/linux*)
! 		os=`echo $os | sed -e 's|gnu/linux|linux|'`
  		;;
  	# First accept the basic system types.
  	# The portable systems comes first.
! 	# Each alternative must end in a *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
! 	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[3456]* \
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigados* | -msdos* | -newsos* | -unicos* | -craympp | -aos* \
! 	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
! 	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
! 	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
! 	      | -ptx* | -coff* | -winnt*)
  		;;
  	-sunos5*)
  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
--- 689,724 ----
  	-solaris)
  		os=-solaris2
  		;;
+ 	-svr4*)
+ 		os=-sysv4
+ 		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
  	-gnu/linux*)
! 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  		;;
  	# First accept the basic system types.
  	# The portable systems comes first.
! 	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
! 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
! 	      | -aos* \
! 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
! 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
! 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
! 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
! 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! 	      | -mingw32* | -linux-gnu* | -uxpv* | -openstep* | -rhapsody* | -darwin* | -beos*)
! 	# Remember, each alternative MUST END IN *, to match a version number.
! 		;;
! 	-linux*)
! 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  		;;
  	-sunos5*)
  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
***************
*** 641,646 ****
--- 744,759 ----
  	-ctix* | -uts*)
  		os=-sysv
  		;;
+ 	-ns2 )
+ 	        os=-nextstep2
+ 		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+ 		;;
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
  	-triton*)
  		os=-sysv3
  		;;
***************
*** 662,670 ****
  	-xenix)
  		os=-xenix
  		;;
-   	-macos)
- 		os=-macos
- 		;;
  	-none)
  		;;
  	*)
--- 775,780 ----
***************
*** 690,701 ****
--- 800,817 ----
  	*-acorn)
  		os=-riscix1.2
  		;;
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
          pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
  		os=-ultrix4.2
  		;;
+ 	m68*-apollo)
+ 		os=-domain
+ 		;;
  	i386-sun)
  		os=-sunos4.0.2
  		;;
***************
*** 711,716 ****
--- 827,835 ----
  	sparc-* | *-sun)
  		os=-sunos4.1.1
  		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
  	*-ibm)
  		os=-aix
  		;;
***************
*** 724,730 ****
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigados
  		;;
  	*-dg)
  		os=-dgux
--- 843,849 ----
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigaos
  		;;
  	*-dg)
  		os=-dgux
***************
*** 738,743 ****
--- 857,865 ----
  	m88k-omron*)
  		os=-luna
  		;;
+ 	*-next )
+ 		os=-nextstep
+ 		;;
  	*-sequent)
  		os=-ptx
  		;;
***************
*** 765,773 ****
--- 887,901 ----
          *-sgi)
  		os=-irix
  		;;
+         *-siemens)
+ 		os=-sysv4
+ 		;;
  	*-masscomp)
  		os=-rtu
  		;;
+ 	f301-fujitsu)
+ 		os=-uxpv
+ 		;;
  	*)
  		os=-none
  		;;
***************
*** 786,794 ****
  			-sunos*)
  				vendor=sun
  				;;
- 			-lynxos*)
- 				vendor=lynx
- 				;;
  			-aix*)
  				vendor=ibm
  				;;
--- 914,919 ----
***************
*** 813,823 ****
  			-mvs*)
  				vendor=ibm
  				;;
-           -macos*)
-                vendor=apple
- 				;;
  			-ptx*)
  				vendor=sequent
  				;;
  		esac
  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
--- 938,951 ----
  			-mvs*)
  				vendor=ibm
  				;;
  			-ptx*)
  				vendor=sequent
+ 				;;
+ 			-vxsim* | -vxworks*)
+ 				vendor=wrs
+ 				;;
+ 			-aux*)
+ 				vendor=apple
  				;;
  		esac
  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
diff -rc HDF4.1r4/hdf/fmpool/configure.in HDF4.1r4-osx/hdf/fmpool/configure.in
*** HDF4.1r4/hdf/fmpool/configure.in	Tue May 23 12:03:23 2000
--- HDF4.1r4-osx/hdf/fmpool/configure.in	Thu May  3 15:42:20 2001
***************
*** 49,54 ****
--- 49,55 ----
    *-cray-unicos*)         host_makefile_frag=config/mh-unicos ;;
    t3*-cray-craympp)       host_makefile_frag=config/mh-t3e ;;
    S370*)                  host_makefile_frag=config/mh-fujivp ;;
+   *-apple-darwin*)	  host_makefile_frag=config/mh-darwin ;;
    *-mac-*)		          host_makefile_frag=config/mh-mac ;;
  esac
  fi
***************
*** 120,125 ****
--- 121,127 ----
    *-cray-unicos*)         files=config/fmpunicos.h ;;
    t3*-cray-craympp)       files=config/fmpt3e.h ;;
    S370*)                  files=config/fmpfujivp.h ;;
+   *-apple-darwin*)	  files=config/fmpdarwin.h ;;
    *-mac-*)		          files=config/fmpmac.h ;;
  esac
  fi
Only in HDF4.1r4-osx/hdf/jpeg/config: jdarwin.h
Only in HDF4.1r4-osx/hdf/jpeg/config: mh-darwin
diff -rc HDF4.1r4/hdf/jpeg/configure.in HDF4.1r4-osx/hdf/jpeg/configure.in
*** HDF4.1r4/hdf/jpeg/configure.in	Tue May 23 12:03:26 2000
--- HDF4.1r4-osx/hdf/jpeg/configure.in	Thu May  3 15:17:39 2001
***************
*** 49,54 ****
--- 49,55 ----
    *-cray-unicos*)         host_makefile_frag=config/mh-unicos ;;
    t3*-cray-craympp)       host_makefile_frag=config/mh-t3e ;;
    S370*)                  host_makefile_frag=config/mh-fujivp ;;
+   *-apple-darwin*)	  host_makefile_frag=config/mh-darwin ;;
    *-mac-*)		          host_makefile_frag=config/mh-mac ;;
  esac
  fi
***************
*** 120,125 ****
--- 121,127 ----
    *-cray-unicos*)         files=config/junicos.h ;;
    t3*-cray-craympp)       files=config/jt3e.h ;;
    S370*)                  files=config/jfujivp.h ;;
+   *-apple-darwin*)	  files=config/jdarwin.h ;;
    *-mac-*)	              files=config/jmac.h ;;
  esac
  fi
diff -rc HDF4.1r4/hdf/src/hdfi.h HDF4.1r4-osx/hdf/src/hdfi.h
*** HDF4.1r4/hdf/src/hdfi.h	Tue Aug 22 14:26:57 2000
--- HDF4.1r4-osx/hdf/src/hdfi.h	Thu May  3 16:30:33 2001
***************
*** 949,955 ****
  #endif /* INTEL86 */
  #endif /* !(defined(macintosh) || defined(MAC)) */
  
! #if defined(NEXT) || defined(NeXT)
  
  #ifndef NEXT
  #define NEXT
--- 949,955 ----
  #endif /* INTEL86 */
  #endif /* !(defined(macintosh) || defined(MAC)) */
  
! #if defined(NEXT) || defined(NeXT) || defined(__APPLE__)
  
  #ifndef NEXT
  #define NEXT
Only in HDF4.1r4-osx/mfhdf/fortran/config: ftest-darwin.f
Only in HDF4.1r4-osx/mfhdf/fortran/config: jackets-darwin.c
Only in HDF4.1r4-osx/mfhdf/fortran/config: netcdf-darwin.inc
Only in HDF4.1r4-osx/mfhdf/libsrc/config: netcdf-darwin.h