configure fails for 6.5 on Unixware 7

I'm using the April 15 snapshot of 6.5, on a SCO Unixware 7.0.1 system.

Running configure produces the message:

$ ./configure
loading cache ./config.cache
checking host system type... Invalid configuration
`i586-unixware-5-7.0.1': machine `i586-unixware-5' not recognized


*************************************************************
configure does not currently recognize your operating system,
therefore you must do a manual configuration of:

Please contact scrappy@hub.org to see about rectifying this,
including the above 'checking host system type...' line
*************************************************************

The config.guess check for SCO UnixWare appears to be broken.  It
outputs i586-unixware-5-7.0.1, which is not recognized by config.sub.

The attached patch changes config.guess back to the 6.4.2 behavior,
which worked just fine.

Andrew Merrill
The Computer Classroom, Inc.

*** ./config.guess.orig    Thu Apr 15 15:47:21 1999
--- ./config.guess    Thu Apr 15 16:04:52 1999
***************
*** 709,715 ****
        (/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
--- 709,715 ----
        (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
          && UNAME_MACHINE=i586
      fi
!     echo ${UNAME_MACHINE}-unixware-sysv${UNAME_RELEASE}
      exit 0 ;;
      pc:*:*:*)
          # uname -m prints for DJGPP always 'pc', but it prints nothing about