Always make links.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index c89306b5831f7c8e635add0b1efa09a72cbf0c2d..84d1da76c4be11e77a518286ab5b1fe60c929a99 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1,4 +1,9 @@
-#!/usr/local/bin/perl -w
+:
+eval 'exec perl -S $0 ${1+"$@"}'
+    if $running_under_some_shell;
+##
+##  Configure -- OpenSSL source tree configuration script
+##
 
 require 5.000;
 use strict;
@@ -77,7 +82,8 @@ my %table=(
 # A few of my development configs
 "purify",      "purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",
 "debug",       "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",
-"debug-rse","gcc:-DTERMIOS -DL_ENDIAN -O -g -ggdb3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+"debug-ben",   "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror:::::",
+"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "dist",                "cc:-O -DNOPROTO::::",
 
 # Basic configs that should work on any box
@@ -224,6 +230,20 @@ my %table=(
 "OpenBSD-mips","gcc:-O2 -DL_ENDIAN:BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::",
 );
 
+# Miscellaneous hacks: this is designed to allow environments where the "one
+# makefile" option does not auto build all files.
+# The first six fields are the hard coded versions of the stuff generated by
+# ctx_size for pem.h: that is EVP_ENCODE_CTX_SIZE, EVP_MD_SIZE EVP_MD_CTX_SIZE,
+# EVP_CIPHER_SIZE, EVP_CIPHER_CTX_SIZE and EVP_MAX_MD_SIZE respectively.
+# If the seventh field is 1 then auto generate
+# crypto/date.h
+# Need to add Win16 and others here.
+
+my %misc_table = (
+"VC-WIN32",    "96:60:152:40:4212:20:1",
+"VC-NT",       "96:60:152:40:4212:20:1"
+);
+
 my $no_asm=0;
 my $postfix="org";
 my $Makefile="Makefile.ssl";
@@ -269,11 +289,19 @@ foreach (@ARGV)
                        {
                        $flags.=$_." ";
                        }
+               elsif ($_ =~ /^-[fK](.*)$/)
+                       {
+                       $flags.=$_." ";
+                       }
                else
                        {
-                       die "unknown options, only -Dxxx, -Lxxx and -lxxx supported\n";
+                       die "unknown options, only -Dxxx, -Lxxx, -lxxx, -fxxx and -Kxxx are supported\n";
                        }
                }
+       elsif ($_ =~ /^([^:]+):(.+)$/) {
+               eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string
+               $target=$1;
+       }
        else
                {
                die "target already defined - $target\n" if ($target ne "");
@@ -304,10 +332,12 @@ if ($no_asm)
        $sha1_obj=$md5_obj=$rmd160_obj="";
        }
 
-my ($bn1)=split(/\s+/,$bn_obj);
-$bn1 = "" unless defined $bn1;
-$bn1=$bn_asm unless ($bn1 =~ /\.o$/);
-$bn_obj="$bn1";
+#my ($bn1)=split(/\s+/,$bn_obj);
+#$bn1 = "" unless defined $bn1;
+#$bn1=$bn_asm unless ($bn1 =~ /\.o$/);
+#$bn_obj="$bn1";
+
+$bn_obj = $bn_asm unless $bn_obj ne "";
 
 $des_obj=$des_enc      unless ($des_obj =~ /\.o$/);
 $bf_obj=$bf_enc                unless ($bf_obj =~ /\.o$/);
@@ -339,7 +369,7 @@ while (<IN>)
        s/^CC=.*$/CC= $cc/;
        s/^CFLAG=.*$/CFLAG= $cflags/;
        s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
-       s/^BN_MULW=.*$/BN_MULW= $bn_obj/;
+       s/^BN_ASM=.*$/BN_ASM= $bn_obj/;
        s/^DES_ENC=.*$/DES_ENC= $des_obj/;
        s/^BF_ENC=.*$/BF_ENC= $bf_obj/;
        s/^CAST_ENC=.*$/CAST_ENC= $cast_obj/;
@@ -356,7 +386,7 @@ close(OUT);
 print "CC            =$cc\n";
 print "CFLAG         =$cflags\n";
 print "EX_LIBS       =$lflags\n";
-print "BN_MULW       =$bn_obj\n";
+print "BN_ASM        =$bn_obj\n";
 print "DES_ENC       =$des_obj\n";
 print "BF_ENC        =$bf_obj\n";
 print "CAST_ENC      =$cast_obj\n";
@@ -574,6 +604,50 @@ close(OUT);
 &Rename($bf,&file_old($bf));
 &Rename($n,$bf);
 
+# Now the miscellaneous fixups
+
+if(defined $misc_table{$target}) {
+       my ($enc_ctx, $md_size, $md_ctx_size, $cipher_size, $cipher_ctx_size,
+               $max_md_size, $date_fix) = 
+               split(/\s*:\s*/,$misc_table{$target} . ":", -1);
+
+#print "EVP_ENCODE_CTX_SIZE $enc_ctx\n";
+#print "EVP_MD_SIZE $md_size\n";
+#print "EVP_MD_CTX_SIZE $md_ctx_size\n";
+#print "EVP_CIPHER_SIZE $cipher_size\n";
+#print "EVP_CIPHER_CTX_SIZE $cipher_ctx_size\n";
+#print "EVP_MAX_MD_SIZE $max_md_size\n";
+#printf "Date fix: %s\n", $date_fix ? "Yes" : "No";
+
+# Fix the date
+
+if($date_fix) {
+       open (OUT,">crypto/date.h") || die "Can't open date.h";
+       printf OUT "#define DATE \"%s\"\n", scalar gmtime();
+       close(OUT);
+}
+
+open (IN, "crypto/pem/pem.org") || die "Can't open crypto/pem/pem.org";
+open (OUT, ">crypto/pem/pem.h") || die "Can't create crypto/pem/pem.h";
+
+# Now fix up pem.h
+while(<IN>) {
+       chop;
+       s/^(#define EVP_ENCODE_CTX_SIZE).*$/$1 $enc_ctx/;
+       s/^(#define EVP_MD_SIZE).*$/$1 $md_size/;
+       s/^(#define EVP_MD_CTX_SIZE).*$/$1 $md_ctx_size/;
+       s/^(#define EVP_CIPHER_SIZE).*$/$1 $cipher_size/;
+       s/^(#define EVP_CIPHER_CTX_SIZE).*$/$1 $cipher_ctx_size/;
+       s/^(#define EVP_MAX_MD_SIZE).*$/$1 $max_md_size/;
+       print OUT "$_\n";
+}
+
+close (IN);
+close (OUT);
+
+
+}
+
 print "SIXTY_FOUR_BIT_LONG mode\n" if $b64l;
 print "SIXTY_FOUR_BIT mode\n" if $b64;
 print "THIRTY_TWO_BIT mode\n" if $b32;
@@ -592,6 +666,9 @@ print "IDEA uses u$type[$idea_int]\n" if $idea_int != $def_int;
 print "RC2 uses u$type[$rc2_int]\n" if $rc2_int != $def_int;
 print "BF_PTR used\n" if $bf_ptr == 1; 
 print "BF_PTR2 used\n" if $bf_ptr == 2; 
+
+system 'make links';
+
 exit(0);
 
 sub bad_target