Final merge from autoconf 2.13.

diff --git a/config.guess b/config.guess
index 3d32f76a7c9348524cca249b768a14bcb8133206..d8527d3e6f87577a2fc7f7f915ea0896f3353750 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -400,7 +400,7 @@ EOF
                   exit (0);
               }
 EOF
-       ${CC-cc} dummy.c -o dummy && HP_ARCH=`./dummy`
+       (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
        rm -f dummy.c dummy
        esac
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -526,13 +526,13 @@ EOF
        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        exit 0 ;;
     i*:CYGWIN*:*)
-       echo ${UNAME_MACHINE}-pc-cygwin32
+       echo ${UNAME_MACHINE}-pc-cygwin
        exit 0 ;;
     i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit 0 ;;
     p*:CYGWIN*:*)
-       echo powerpcle-unknown-cygwin32
+       echo powerpcle-unknown-cygwin
        exit 0 ;;
     prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`