(set_frame_menubar): Don't add ibw to menubar_size.

[gnu-emacs] / config.guess

diff --git a/config.guess b/config.guess
index f89f911b7097346c5030c143fef08e4a772c814f..0613f737fa864df78dd5f1bcdbc09bdabda46cd8 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -245,7 +245,7 @@ EOF
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
-           9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
+           9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
            9000/8?? )            HP_ARCH=hppa1.0 ;;
        esac
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -320,8 +320,10 @@ EOF
     CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE}
        exit 0 ;;
-    CRAY*C90:*:*:*)
-       echo c90-cray-unicos${UNAME_RELEASE}
+    CRAY*[A-Z]90:*:*:*)
+       echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+       | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
        exit 0 ;;
     CRAY-2:*:*:*)
        echo cray2-cray-unicos