Missed rc2_int from before.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 6d36ae1a6b6f2d4531694d257e61c234577032ac..6a2ca8a4e1b14b8e47468c74603624731d9f11a3 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -192,7 +192,6 @@ my $zlib=1;      # but "no-zlib" is default
 my $no_rfc3779=0;
 my $no_asm=0;
 my $no_dso=0;
-my $Makefile="Makefile";
 my $default_ranlib;
 $config{fips}=0;
 
@@ -811,7 +810,7 @@ $config{openssldir} = catdir($config{prefix}, $config{openssldir})
 # Allow environment CC to override compiler...
 $target{cc} = $ENV{CC} || $target{cc};
 
-# For cflags and lflags, add the debug_ or release_ attributes
+# For cflags, lflags and ex_libs, add the debug_ or release_ attributes
 # Do it in such a way that no spurious space is appended (hence the grep).
 $config{cflags} = join(" ",
                       grep { $_ ne "" } ($target{cflags},
@@ -819,6 +818,9 @@ $config{cflags} = join(" ",
 $config{lflags} = join(" ",
                       grep { $_ ne "" } ($target{lflags},
                                          $target{$build_prefix."lflags"}));
+$config{ex_libs} = join(" ",
+                       grep { $_  ne "" } ($target{ex_libs},
+                                           $target{$build_prefix."ex_libs"}));
 
 $target{ranlib} = $ENV{'RANLIB'} || $target{ranlib} || $default_ranlib;
 $target{ar} = $ENV{'AR'} || "ar";
@@ -839,11 +841,6 @@ $config{enginesdir}=$config{prefix} . "/" . $config{libdir}  . "/engines";
 
 $config{cflags} .= "$exp_cflags";
 
-# '%' in $config{lflags} is used to split flags to "pre-" and post-flags
-my ($pre,$post)=split('%',$config{lflags});
-if (defined($post))    { $config{prelflags}=$pre; $config{lflags}=$post;       }
-else                   { $config{prelflags}="";   $config{lflags}=$pre;        }
-
 if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` !~ m/-mno-cygwin/m)
        {
        $config{cflags} =~ s/-mno-cygwin\s*//;
@@ -922,7 +919,7 @@ else
 #              }
        }
 
-$config{lflags}="$libs$config{lflags}" if ($libs ne "");
+$config{ex_libs}="$libs$config{ex_libs}" if ($libs ne "");
 
 if ($no_asm)
        {
@@ -943,11 +940,11 @@ if ($zlib)
                {
                if (defined($withargs{"zlib-lib"}))
                        {
-                       $config{lflags} .= " -L" . $withargs{"zlib-lib"} . " -lz";
+                       $config{ex_libs} .= " -L" . $withargs{"zlib-lib"} . " -lz";
                        }
                else
                        {
-                       $config{lflags} .= " -lz";
+                       $config{ex_libs} .= " -lz";
                        }
                }
        else
@@ -1010,17 +1007,17 @@ if ($target =~ /-icc$/) # Intel C compiler
                }
        if ($iccver>=9)
                {
-               $config{lflags}.=" -i-static";
-               $config{lflags}=~s/-no_cpprt/-no-cpprt/;
+               $config{ex_libs}.=" -i-static";
+               $config{ex_libs}=~s/-no_cpprt/-no-cpprt/;
                }
        if ($iccver>=10)
                {
-               $config{lflags}=~s/-i-static/-static-intel/;
+               $config{ex_libs}=~s/-i-static/-static-intel/;
                }
        if ($iccver>=11)
                {
                $config{cflags}.=" -no-intel-extensions";       # disable Cilk
-               $config{lflags}=~s/-no-cpprt/-no-cxxlib/;
+               $config{ex_libs}=~s/-no-cpprt/-no-cxxlib/;
                }
        }
 
@@ -1126,7 +1123,6 @@ $config{bn_ll}                    =0;
 $config{export_var_as_fn}      =0;
 my $def_int="unsigned int";
 $config{rc4_int}               =$def_int;
-$config{rc2_int}               =$def_int;
 ($config{b64l},$config{b64},$config{b32})=(0,0,1);
 
 foreach (sort split(/\s+/,$target{bn_ops})) {
@@ -1178,7 +1174,7 @@ if ($strict_warnings)
                        }
                if ($target =~ /^BSD-/)
                        {
-                       $config{lflags} .= " -lexecinfo";
+                       $config{ex_libs} .= " -lexecinfo";
                        }
                }
        }
@@ -1261,7 +1257,8 @@ close(OUT);
 print "IsMK1MF       =", ($target{build_scheme}->[0] eq "mk1mf" ? "yes" : "no"), "\n";
 print "CC            =$target{cc}\n";
 print "CFLAG         =$config{cflags}\n";
-print "EX_LIBS       =$config{lflags}\n";
+print "LFLAGS        =$config{lflags}\n";
+print "EX_LIBS       =$config{ex_libs}\n";
 print "CPUID_OBJ     =$target{cpuid_obj}\n";
 print "BN_ASM        =$target{bn_obj}\n";
 print "EC_ASM        =$target{ec_obj}\n";
@@ -1289,9 +1286,11 @@ print "SIXTY_FOUR_BIT mode\n" if $config{b64};
 print "THIRTY_TWO_BIT mode\n" if $config{b32};
 print "BN_LLONG mode\n" if $config{bn_ll};
 print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} != $def_int;
-print "RC2 uses $config{rc2_int}\n" if $config{rc2_int} != $def_int;
 
-run_dofile("$Makefile.in","$Makefile");
+run_dofile("Makefile.in","Makefile");
+
+run_dofile("util/domd.in", "util/domd");
+chmod 0755, "util/domd";
 
 run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h");
 
@@ -1665,8 +1664,9 @@ sub run_dofile()
     my $in = shift;
     my $out = shift;
 
+    unlink $out || warn "Can't remove $out, $!"
+        if -f $out;
     die "Can't open $in, $!" unless -f $in;
-    # should we remove $out ?
     system("$config{perl} -I. -Mconfigdata util/dofile.pl -o\"Configure\" $in > $out.new");
     exit 1 if $? != 0;
     rename("$out.new", $out) || die "Can't rename $out.new, $!";
@@ -1693,8 +1693,11 @@ sub print_table_entry
        "unistd",
        "ld",
        "lflags",
+       "ex_libs",
        "debug_lflags",
+       "debug_ex_libs",
        "release_lflags",
+       "release_ex_libs",
        "bn_ops",
        "cpuid_obj",
        "bn_obj",