Improve description of -trusted, -srvcert, -recipient, and -expect_sender CMP options

[openssl.git] / config

diff --git a/config b/config
index 8a65b0e6e2e38c42a905a50c17e0abf733af7340..2e149ded7cffbf4421cc73d1d9b38198ef1fadc8 100755 (executable)
--- a/config
+++ b/config
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -498,10 +498,7 @@ case "$GUESSOS" in
        OUT="ios64-cross" ;;
   alpha-*-linux2)
         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
-       case ${ISA:-generic} in
-       *[678]) OUT="linux-alpha+bwx-$CC" ;;
-       *)      OUT="linux-alpha-$CC" ;;
-       esac
+       OUT="linux-alpha-$CC"
        if [ "$CC" = "gcc" ]; then
            case ${ISA:-generic} in
            EV5|EV45)           __CNF_CFLAGS="$__CNF_CFLAGS -mcpu=ev5"
@@ -850,14 +847,6 @@ case "$GUESSOS" in
   i386-*) options="$options 386" ;;
 esac
 
-for i in aes aria bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha sm2 sm3 sm4
-do
-  if [ ! -d $THERE/crypto/$i ]
-  then
-    options="$options no-$i"
-  fi
-done
-
 if [ -z "$OUT" ]; then
   OUT="$CC"
 fi
@@ -898,8 +887,12 @@ fi
 
 OUT="$OUT"
 
-$PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
-if [ $? = "0" ]; then
+if [ "$OUT" = "darwin64-x86_64-cc" ]; then
+    echo "WARNING! If you wish to build 32-bit libraries, then you have to"
+    echo "         invoke 'KERNEL_BITS=32 $THERE/config $options'."
+fi
+
+if $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null; then
   if [ "$VERBOSE" = "true" ]; then
     echo /usr/bin/env \
         __CNF_CPPDEFINES="'$__CNF_CPPDEFINES'" \
@@ -929,8 +922,5 @@ else
   exit 1
 fi
 
-if [ "$OUT" = "darwin64-x86_64-cc" ]; then
-    echo "WARNING! If you wish to build 32-bit libraries, then you have to"
-    echo "         invoke 'KERNEL_BITS=32 $THERE/config $options'."
-fi
+# Do not add anothing from here on, so we don't lose the Configure exit code
 )