From fcbc1e6cd12d352d4174dbe2546656f1138f7bdf Mon Sep 17 00:00:00 2001
From: Wilfredo Sanchez <tritan@mit.edu>
Date: Wed, 3 May 2000 02:20:05 +0000
Subject: [PATCH] Clean up Rhapsody guessing.  Use Power* (catches PowerBook).
 In Mac OS X, uname will return Darwin, not Mac OS, as it did in DP3. Since
 DP3 is still the current available release, Mac OS is still understood. GNU
 string for OS X on Macs is powerpc-apple-darwin1.x.

The above is consistant with what is being submitted to the autoconf sources.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12211 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/config/config.guess | 14 +++++---------
 src/config/config.sub   |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/config/config.guess b/src/config/config.guess
index 98fea7b84..c38d2329a 100644
--- a/src/config/config.guess
+++ b/src/config/config.guess
@@ -811,20 +811,16 @@ EOF
 	echo i586-pc-beos
 	exit 0 ;;
 # MIT addition
-    Power\ Macintosh:Rhapsody:*:*)
+    Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
 # MIT addition
-    powerpc:Rhapsody:*:*)
-       echo powerpc-unknown-rhapsody${UNAME_RELEASE}
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
 # MIT addition
-    i?86:Rhapsody:*:*)
-       echo i386-unknown-rhapsody${UNAME_RELEASE}
-       exit 0 ;;
-# MIT addition
-    Power\ Macintosh:Mac\ OS:*:*)
-	echo powerpc-apple-macos${UNAME_RELEASE}
+    *:Darwin:*:*|*:"Mac OS":*:*)
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
 esac
 
diff --git a/src/config/config.sub b/src/config/config.sub
index 995263424..ebce5acb7 100644
--- a/src/config/config.sub
+++ b/src/config/config.sub
@@ -714,7 +714,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -macos* | -rhapsody*)
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -darwin* | -rhapsody*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-linux*)
-- 
2.26.2