Remove support for Borland C++

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index d1aac5bfec259065e3b5ed1ef032b1c8852bfb05..a2cd0407e1fad150d51204055856641e655b914a 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -106,7 +106,6 @@ $infile="MINFO";
        "VC-NT",   "Microsoft Visual C++ [4-6] - Windows NT ONLY",
        "Mingw32", "GNU C++ - Windows NT or 9x",
        "Mingw32-files", "Create files with DOS copy ...",
-       "BC-NT",   "Borland C++ 4.5 - Windows NT",
        "linux-elf","Linux elf",
        "ultrix-mips","DEC mips ultrix",
        "FreeBSD","FreeBSD distribution",
@@ -134,7 +133,8 @@ foreach (@ARGV)
                print STDERR <<"EOF";
 and [options] can be one of
        no-md2 no-md4 no-md5 no-sha no-mdc2     - Skip this digest
-       no-ripemd
+       no-rmd160
+       no-blake2                               - No blake2
        no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
        no-bf no-cast no-aes no-camellia no-seed
        no-rsa no-dsa no-dh                     - Skip this public key cipher
@@ -223,11 +223,6 @@ elsif ($platform eq "Mingw32-files")
        {
        require 'Mingw32f.pl';
        }
-elsif ($platform eq "BC-NT")
-       {
-       $bc=1;
-       require 'BC-32.pl';
-       }
 elsif ($platform eq "FreeBSD")
        {
        require 'unix.pl';
@@ -1073,6 +1068,7 @@ sub var_add
        @a=grep(!/(^md4)|(_md4$)/,@a) if $no_md4;
        @a=grep(!/(^md5)|(_md5$)/,@a) if $no_md5;
        @a=grep(!/(rmd)|(ripemd)/,@a) if $no_ripemd;
+       @a=grep(!/(^blake)/,@a) if $no_blake2;
 
        @a=grep(!/(^d2i_r_)|(^i2d_r_)/,@a) if $no_rsa;
        @a=grep(!/(^p_open$)/,@a) if $no_rsa;
@@ -1377,7 +1373,8 @@ sub read_options
                "no-md2" => \$no_md2,
                "no-md4" => \$no_md4,
                "no-md5" => \$no_md5,
-               "no-ripemd" => \$no_ripemd,
+               "no-rmd160" => \$no_ripemd,
+               "no-blake2" => \$no_blake2,             
                "no-mdc2" => \$no_mdc2,
                "no-whirlpool" => \$no_whirlpool,
                "no-patents" =>