From 6aa88652e5eabfb3e832ead3eada01d74b907703 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Sat, 30 Nov 2002 03:47:48 +0000
Subject: [PATCH] * blessed by RMS :-)

2002-11-30  Ben Elliston  <bje@redhat.com>

	From Joel Baker <lucifer@lightbearer.com>:
	* config.guess: Append "-gnu" to triplet on Debian/NetBSD systems.
	* config.sub: Recognise netbsd*-gnu*.
---
 ChangeLog    |  6 ++++++
 config.guess | 13 ++++++++++++-
 config.sub   |  4 ++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00daa45..3a7ddb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-30  Ben Elliston  <bje@redhat.com>
+
+	From Joel Baker <lucifer@lightbearer.com>:
+	* config.guess: Append "-gnu" to triplet on Debian/NetBSD systems.
+	* config.sub: Recognise netbsd*-gnu*.
+
 2002-11-30  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
 
 	* config.guess (mips64:Linux:*:*): Recognize.
diff --git a/config.guess b/config.guess
index a69d969..a92abcc 100755
--- a/config.guess
+++ b/config.guess
@@ -178,7 +178,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
diff --git a/config.sub b/config.sub
index aeb3bd9..931e1de 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-11-13'
+timestamp='2002-11-30'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;