EXIT() should mainly be exit(n), not return(n). OPENSSL_EXIT() will

[openssl.git] / config

diff --git a/config b/config
index 72905c90ed1a0f258bb47d30ba9b050972171644..79ce83aac3d6b8f462fa5b49309af06d0583b5d5 100755 (executable)
--- a/config
+++ b/config
@@ -458,7 +458,7 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
 fi
 
 if [ "${SYSTEM}" = "AIX" ]; then       # favor vendor cc over gcc
-    (cc) 2>&1 | grep -iv "command not found" > /dev/null && CC=cc
+    (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
 fi
 
 CCVER=${CCVER:-0}
@@ -473,7 +473,7 @@ echo Operating system: $GUESSOS
 # more time that I want to waste at the moment
 case "$GUESSOS" in
   mips2-sgi-irix)
-       CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+       CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
        CPU=${CPU:-0}
        if [ $CPU -ge 4000 ]; then
                options="$options -mips2"
@@ -481,7 +481,7 @@ case "$GUESSOS" in
        OUT="irix-$CC"
        ;;
   mips3-sgi-irix)
-       CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+       CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
        CPU=${CPU:-0}
        if [ $CPU -ge 5000 ]; then
                options="$options -mips4"
@@ -497,7 +497,7 @@ case "$GUESSOS" in
          echo "         You have about 5 seconds to press Ctrl-C to abort."
          (stty -icanon min 0 time 50; read waste) < /dev/tty
        fi
-        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
         CPU=${CPU:-0}
         if [ $CPU -ge 5000 ]; then
                 options="$options -mips4"
@@ -641,6 +641,7 @@ EOF
   *-*-sunos4) OUT="sunos-$CC" ;;
   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
   sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
+  ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
   *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
   *-freebsd[1-2]*) OUT="FreeBSD" ;;
   *86*-*-netbsd) OUT="NetBSD-x86" ;;