1999-08-28 Ben Elliston <bje@cygnus.com>

	* config.guess: Once and for all, emit the correct string for
	Unixware 7! Contributed by Mike Hopkirk <hops@sco.com>.

diff --git a/ChangeLog b/ChangeLog
index e75fe72e333f283b7c2934f05798230f1abed51b..7c3f09ce027b6df3a868ed1c92b09ec1e974324b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-28  Ben Elliston  <bje@cygnus.com>
 
+       * config.guess: Once and for all, emit the correct string for
+       Unixware 7! Contributed by Mike Hopkirk <hops@sco.com>.
+
        * acspecific.m4 (AC_C_INLINE): Qualify the return type of the
        dummy inlined function to satisfy newer C++ compilers. Fix for
        autoconf/49.

diff --git a/config.guess b/config.guess
index cca6757e2742e8ba1d1b53336207c36824f1f232..322642ebaa3032728720d0c345ef4b57dcc2d239 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -805,12 +805,13 @@ EOF
        fi
        exit 0 ;;
     i?86:*:5:7*)
-       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
-       (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
-       (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+           echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+       else
+           echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+       fi
        exit 0 ;;
     i?86:*:3.2:*)
        if test -f /usr/options/cb.name; then