From: Ben Elliston Date: Fri, 27 Aug 1999 23:49:03 +0000 (+0000) Subject: 1999-08-28 Ben Elliston X-Git-Tag: trunk-pre-merge-trunk-into-experimental-1999-10-01~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dae3b1aebd1828854d50f333cc29de14c0623e3;p=thirdparty%2Fautoconf.git 1999-08-28 Ben Elliston * config.guess: Once and for all, emit the correct string for Unixware 7! Contributed by Mike Hopkirk . --- diff --git a/ChangeLog b/ChangeLog index e75fe72e..7c3f09ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-08-28 Ben Elliston + * config.guess: Once and for all, emit the correct string for + Unixware 7! Contributed by Mike Hopkirk . + * 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 cca6757e..322642eb 100755 --- 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