Add EVP_PKEY_METHOD redirection test

[openssl.git] / config

diff --git a/config b/config
index ad788cbf73ada759ddbceb56ef4570e80454e9ea..6c01ebd8b26387584801582cca4505e212a42b5e 100755 (executable)
--- a/config
+++ b/config
@@ -320,6 +320,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
        ;;
 
+    # The following combinations are supported
+    # MINGW64* on x86_64 => mingw64
+    # MINGW32* on x86_64 => mingw
+    # MINGW32* on i?86 => mingw
+    #
+    # MINGW64* on i?86 isn't expected to work...
+    MINGW64*:*:*:x86_64)
+       echo "${MACHINE}-whatever-mingw64"; exit 0;
+       ;;
     MINGW*)
        echo "${MACHINE}-whatever-mingw"; exit 0;
        ;;
@@ -445,13 +454,6 @@ case "$GUESSOS" in
     OUT=uClinux-dist
        ;;
   mips3-sgi-irix)
-       #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"
-       #else
-       #       options="$options -mips3"
-       #fi
        OUT="irix-mips3-$CC"
        ;;
   mips4-sgi-irix64)
@@ -461,13 +463,6 @@ case "$GUESSOS" in
          echo "         You have about 5 seconds to press Ctrl-C to abort."
          (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
        fi
-        #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"
-        #else
-        #        options="$options -mips3"
-        #fi
        OUT="irix-mips3-$CC"
        ;;
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
@@ -493,9 +488,7 @@ case "$GUESSOS" in
            echo "         invoke 'KERNEL_BITS=64 $THERE/config $options'."
            if [ "$DRYRUN" = "false" -a -t 1 ]; then
              echo "         You have about 5 seconds to press Ctrl-C to abort."
-             # The stty technique used elsewhere doesn't work on
-             # MacOS. At least, right now on this Mac.
-             sleep 5
+             (trap "stty `stty -g`; exit 1" 2; stty -icanon min 0 time 50; read waste; exit 0) <&1 || exit
            fi
        fi
        if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
@@ -801,8 +794,6 @@ case "$GUESSOS" in
            options="$options no-asm"
        fi
        ;;
-  i[3456]86-*-mingw) OUT="mingw" ;;
-  x86_64-*-mingw) OUT="mingw64" ;;
   # these are all covered by the catchall below
   i[3456]86-*-cygwin) OUT="Cygwin-x86" ;;
   *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;