* config.guess: Clean up NeXT support, to allow nextstep

	on Intel machines.  Make OS be nextstep.
	* config.guess: Add alternate forms for Convex.

diff --git a/ChangeLog b/ChangeLog
index 6156ba6..1992bb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan 24 18:40:06 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+       * config.guess:  Clean up NeXT support, to allow nextstep
+       on Intel machines.  Make OS be nextstep.
+
+Sun Jan 23 18:47:22 1994  Richard Kenner  (kenner@vlsi1.ultra.nyu.edu)
+
+       * config.guess: Add alternate forms for Convex.
+
 Thu Jan 20 16:13:41 1994  Stu Grossman  (grossman at cygnus.com)
 
        * configure:  Completely rewrite option processing.  Take

diff --git a/config.guess b/config.guess
index d1c7f9f..299c6f4 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -84,6 +84,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # Delta 88k system running SVR3
        echo m88k-motorola-sysv3
        exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+       echo m88k-tektronix-sysv3
+       exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+       echo m68k-tektronix-bsd
+       exit 0 ;;
     *:IRIX:*:*)
        echo mips-sgi-irix${UNAME_RELEASE}
        exit 0 ;;
@@ -153,10 +159,10 @@ EOF
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
        exit 0 ;;
-    C1*:ConvexOS:*:*)
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1:*)
        echo c1-convex-bsd
         exit 0 ;;
-    C2*:ConvexOS:*:*)
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2:*)
        echo c2-convex-bsd
         exit 0 ;;
     CRAY*X-MP:UNICOS:*:*)
@@ -238,7 +244,10 @@ main()
 #endif
 
 #if defined(NeXT)
-  printf("m68k-next-bsd\n"); exit(0);
+#if !defined(__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  printf("%s-next-nextstep\n", __ARCHITECTURE__); exit(0);
 #endif
 
 #if defined (MULTIMAX) || defined (n16)
@@ -277,6 +286,10 @@ EOF
 ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
 rm -f dummy.c dummy
 
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
 #echo '(Unable to guess system type)' 1>&2
 
 exit 1