Adjust the configuration target name from Cygwin-i686 to Cygwin-x86

[openssl.git] / config

diff --git a/config b/config
index 94534cb3bb0834146b3fa18407378e8e591396f3..2b3b6d8dc9303d474a73eeb7f458280052dffe15 100755 (executable)
--- a/config
+++ b/config
@@ -323,15 +323,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-mingw"; exit 0;
        ;;
     CYGWIN*)
-       case "$RELEASE" in
-           [bB]*|1.0|1.[12].*)
-               echo "${MACHINE}-whatever-cygwin_pre1.3"
-               ;;
-           *)
-               echo "${MACHINE}-whatever-cygwin"
-               ;;
-       esac
-       exit 0
+       echo "${MACHINE}-pc-cygwin"; exit 0
        ;;
 
     vxworks*)
@@ -814,8 +806,8 @@ case "$GUESSOS" in
        fi
        ;;
   # these are all covered by the catchall below
-  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
-  *-*-cygwin) OUT="Cygwin" ;;
+  i[3456]86-*-cygwin) OUT="Cygwin-x86" ;;
+  *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
   x86pc-*-qnx6) OUT="QNX6-i386" ;;
   *-*-qnx6) OUT="QNX6" ;;
   x86-*-android|i?86-*-android) OUT="android-x86" ;;
@@ -873,27 +865,6 @@ do
   fi
 done
 
-# Discover Kerberos 5 (since it's still a prototype, we don't
-# do any guesses yet, that's why this section is commented away.
-#if [ -d /usr/kerberos ]; then
-#    krb5_dir=/usr/kerberos
-#    if [ \( -f $krb5_dir/lib/libgssapi_krb5.a -o -f $krb5_dir/lib/libgssapi_krb5.so* \)\
-#      -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\
-#      -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\
-#      -a \( -f $krb5_dir/lib/libk5crypto.a -o -f $krb5_dir/lib/libk5crypto.so* \)\
-#      -a \( -f $krb5_dir/include/krb5.h \) ]; then
-#      options="$options --with-krb5-flavor=MIT"
-#    fi
-#elif [ -d /usr/heimdal ]; then
-#    krb5_dir=/usr/heimdal
-#    if [ \( -f $krb5_dir/lib/libgssapi.a -o -f $krb5_dir/lib/libgssapi.so* \)\
-#      -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\
-#      -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\
-#      -a \( -f $krb5_dir/include/krb5.h \) ]; then
-#      options="$options --with-krb5-flavor=Heimdal"
-#    fi
-#fi
-
 if [ -z "$OUT" ]; then
   OUT="$CC"
 fi