Configure - get rid of the special debug_ and release_ settings

[openssl.git] / Configure

diff --git a/Configure b/Configure
index b6c8d8ce6c60c81c79b2f81e0daa719da7d31e7b..eab3c661d279bd434eda85bc6355ed32c5b81ed2 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -136,9 +136,9 @@ my $apitable = {
     "0.9.8" => "0x00908000L",
 };
 
     "0.9.8" => "0x00908000L",
 };
 

-my $base_target = "BASE";   # The template that all other inherit from

 our %table = ();
 our %config = ();
 our %table = ();
 our %config = ();

+our %withargs = ();

 
 # Forward declarations ###############################################
 
 
 # Forward declarations ###############################################
 


@@ -438,8 +438,7 @@ $config{openssl_other_defines}=[];
 my $libs="";
 my $target="";
 $config{options}="";
 my $libs="";
 my $target="";
 $config{options}="";

-my %withargs=();
-my $build_prefix = "release_";
+$config{build_type} = "release";

 
 my @argvcopy=@ARGV;
 
 
 my @argvcopy=@ARGV;
 


@@ -592,11 +591,11 @@ foreach (@argvcopy)
                }
        elsif (/^--debug$/)
                {
                }
        elsif (/^--debug$/)
                {

-               $build_prefix = "debug_";
+               $config{build_type} = "debug";

                }
        elsif (/^--release$/)
                {
                }
        elsif (/^--release$/)
                {

-               $build_prefix = "release_";
+               $config{build_type} = "release";

                }
        elsif (/^386$/)
                { $config{processor}=386; }
                }
        elsif (/^386$/)
                { $config{processor}=386; }


@@ -677,11 +676,6 @@ foreach (@argvcopy)
                        $user_cflags.=" ".$_;
                        }
                }
                        $user_cflags.=" ".$_;
                        }
                }

-       elsif ($_ =~ /^([^:]+):(.+)$/)
-               {
-               eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string
-               $target=$1;
-               }

        else
                {
                die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
        else
                {
                die "target already defined - $target (offending arg: $_)\n" if ($target ne "");


@@ -832,7 +826,7 @@ print "Configuring for $target\n";
 # Support for legacy targets having a name starting with 'debug-'
 my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
 if ($d) {
 # Support for legacy targets having a name starting with 'debug-'
 my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
 if ($d) {

-    $build_prefix = "debug_";
+    $config{build_type} = "debug";

 
     # If we do not find debug-foo in the table, the target is set to foo.
     if (!$table{$target}) {
 
     # If we do not find debug-foo in the table, the target is set to foo.
     if (!$table{$target}) {


@@ -840,11 +834,12 @@ if ($d) {
     }
 }
 $config{target} = $target;
     }
 }
 $config{target} = $target;

-delete $table{$base_target}->{template}; # or the next test will fail.
-my %target = ( %{$table{$base_target}}, resolve_config($target) );
+my %target = resolve_config($target);

 
 &usage if (!%target || $target{template});
 
 
 &usage if (!%target || $target{template});
 

+%target = ( %{$table{DEFAULTS}}, %target );
+

 $target{exe_extension}="";
 $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
                                   || $config{target} =~ /^(?:Cygwin|mingw)/);
 $target{exe_extension}="";
 $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
                                   || $config{target} =~ /^(?:Cygwin|mingw)/);


@@ -858,38 +853,23 @@ $target{dso_extension}=$target{shared_extension_simple};
     if ($config{target} =~ /^(?:Cygwin|mingw)/);
 
 
     if ($config{target} =~ /^(?:Cygwin|mingw)/);
 
 

-$default_ranlib        = which("ranlib") || "true";
-$config{perl}  = $ENV{'PERL'} || which("perl5") || which("perl") || "perl";
-my $make       = $ENV{'MAKE'} || "make";
-

 $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'}
     if $config{cross_compile_prefix} eq "";
 
 $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'}
     if $config{cross_compile_prefix} eq "";
 

-# Allow environment CC to override compiler...
-$target{cc} = $ENV{CC} || $target{cc};
+# Allow overriding the names of some tools.  USE WITH CARE
+$config{perl} =    $ENV{'PERL'}    || which("perl5") || which("perl") || "perl";
+$target{cc} =      $ENV{'CC'}      || $target{cc}      || "cc";
+$target{ranlib} =  $ENV{'RANLIB'}  || $target{ranlib}  || which("ranlib") || "true";
+$target{ar} =      $ENV{'AR'}      || $target{ar}      || "ar";
+$target{nm} =      $ENV{'NM'}      || $target{nm}      || "nm";

 
 # For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_
 # or release_ attributes.
 # Do it in such a way that no spurious space is appended (hence the grep).
 
 # For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_
 # or release_ attributes.
 # Do it in such a way that no spurious space is appended (hence the grep).

-$config{defines} = [ @{$target{defines}},
-                     @{$target{$build_prefix."defines"}} ];
-$config{cflags} = join(" ",
-                      grep { $_ ne "" } ($target{cflags},
-                                         $target{$build_prefix."cflags"}));
-$config{lflags} = join(" ",
-                      grep { $_ ne "" } ($target{lflags},
-                                         $target{$build_prefix."lflags"}));
-$config{plib_lflags} = join(" ",
-                           grep { $_  ne "" } ($target{plib_lflags},
-                                               $target{$build_prefix."plib_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";
-$target{arflags} = "" if !defined($target{arflags});
-$target{nm} = "nm";
+$config{defines} = $target{defines} || [];
+$config{cflags} = $target{cflags} || "";
+$config{ex_libs} = $target{ex_libs} || "";
+

 # Make sure build_scheme is consistent.
 $target{build_scheme} = [ $target{build_scheme} ]
     if ref($target{build_scheme}) ne "ARRAY";
 # Make sure build_scheme is consistent.
 $target{build_scheme} = [ $target{build_scheme} ]
     if ref($target{build_scheme}) ne "ARRAY";


@@ -989,26 +969,6 @@ if ($threads)
        push @{$config{openssl_thread_defines}}, @thread_defines;
        }
 
        push @{$config{openssl_thread_defines}}, @thread_defines;
        }
 

-unless ($disabled{zlib})
-       {
-       push @{$config{defines}}, "ZLIB";
-       if (defined($disabled{"zlib-dynamic"}))
-               {
-               if (defined($withargs{zlib_lib}))
-                       {
-                       $config{ex_libs} .= " -L" . $withargs{zlib_lib} . " -lz";
-                       }
-               else
-                       {
-                       $config{ex_libs} .= " -lz";
-                       }
-               }
-       else
-               {
-               push @{$config{defines}}, "ZLIB_SHARED";
-               }
-       }
-

 # With "deprecated" disable all deprecated features.
 if (defined($disabled{"deprecated"})) {
         $config{api} = $maxapi;
 # With "deprecated" disable all deprecated features.
 if (defined($disabled{"deprecated"})) {
         $config{api} = $maxapi;


@@ -1052,13 +1012,8 @@ if ($target{sys_id} ne "")
        push @{$config{openssl_sys_defines}}, "OPENSSL_SYS_$target{sys_id}";
        }
 
        push @{$config{openssl_sys_defines}}, "OPENSSL_SYS_$target{sys_id}";
        }
 

-if ($target{ranlib} eq "")
-       {
-       $target{ranlib} = $default_ranlib;
-       }
-

 unless ($disabled{asm}) {
 unless ($disabled{asm}) {

-    $target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386");
+    $target{cpuid_asm_src}=$table{DEFAULTS}->{cpuid_asm_src} if ($config{processor} eq "386");

     $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
 
     # bn-586 is the only one implementing bn_*_part_words
     $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
 
     # bn-586 is the only one implementing bn_*_part_words


@@ -1081,7 +1036,7 @@ unless ($disabled{asm}) {
     if ($target{md5_asm_src}) {
        push @{$config{defines}}, "MD5_ASM";
     }
     if ($target{md5_asm_src}) {
        push @{$config{defines}}, "MD5_ASM";
     }

-    $target{cast_asm_src}=$table{BASE}->{cast_asm_src} unless $disabled{pic}; # CAST assembler is not PIC
+    $target{cast_asm_src}=$table{DEFAULTS}->{cast_asm_src} unless $disabled{pic}; # CAST assembler is not PIC

     if ($target{rmd160_asm_src}) {
        push @{$config{defines}}, "RMD160_ASM";
     }
     if ($target{rmd160_asm_src}) {
        push @{$config{defines}}, "RMD160_ASM";
     }


@@ -1098,7 +1053,7 @@ unless ($disabled{asm}) {
     }
     if ($target{wp_asm_src} =~ /mmx/) {
         if ($config{processor} eq "386") {
     }
     if ($target{wp_asm_src} =~ /mmx/) {
         if ($config{processor} eq "386") {

-           $target{wp_asm_src}=$table{BASE}->{wp_asm_src};
+           $target{wp_asm_src}=$table{DEFAULTS}->{wp_asm_src};

        } elsif (!$disabled{"whirlpool"}) {
            $config{cflags}.=" -DWHIRLPOOL_ASM";
        }
        } elsif (!$disabled{"whirlpool"}) {
            $config{cflags}.=" -DWHIRLPOOL_ASM";
        }


@@ -1268,6 +1223,8 @@ if ($builder eq "unified") {
             if (-f catfile($srcdir, "engines", $_, "build.info"));
     }
 
             if (-f catfile($srcdir, "engines", $_, "build.info"));
     }
 

+    $config{build_infos} = [ ];
+

     foreach (@build_infos) {
         my $sourced = catdir($srcdir, $_->[0]);
         my $buildd = catdir($blddir, $_->[0]);
     foreach (@build_infos) {
         my $sourced = catdir($srcdir, $_->[0]);
         my $buildd = catdir($blddir, $_->[0]);


@@ -1291,6 +1248,7 @@ if ($builder eq "unified") {
         my %renames = ();
         my %sharednames = ();
 
         my %renames = ();
         my %sharednames = ();
 

+        push @{$config{build_infos}}, catfile(abs2rel($sourced, $blddir), $f);

         my $template = Text::Template->new(TYPE => 'FILE',
                                            SOURCE => catfile($sourced, $f));
         die "Something went wrong with $sourced/$f: $!\n" unless $template;
         my $template = Text::Template->new(TYPE => 'FILE',
                                            SOURCE => catfile($sourced, $f));
         die "Something went wrong with $sourced/$f: $!\n" unless $template;


@@ -1713,10 +1671,12 @@ print "IsMK1MF       =", ($builder eq "mk1mf" ? "yes" : "no"), "\n";
 print "CC            =$target{cc}\n";
 print "CFLAG         =$config{cflags}\n";
 print "DEFINES       =",join(" ", @{$config{defines}}),"\n";
 print "CC            =$target{cc}\n";
 print "CFLAG         =$config{cflags}\n";
 print "DEFINES       =",join(" ", @{$config{defines}}),"\n";

-print "LFLAG         =$config{lflags}\n";
-print "PLIB_LFLAG    =$config{plib_lflags}\n";
+print "LFLAG         =$target{lflags}\n";
+print "PLIB_LFLAG    =$target{plib_lflags}\n";

 print "EX_LIBS       =$config{ex_libs}\n";
 print "EX_LIBS       =$config{ex_libs}\n";

+print "APPS_OBJ      =$target{apps_obj}\n";

 print "CPUID_OBJ     =$target{cpuid_obj}\n";
 print "CPUID_OBJ     =$target{cpuid_obj}\n";

+print "UPLINK_OBJ    =$target{uplink_obj}\n";

 print "BN_ASM        =$target{bn_obj}\n";
 print "EC_ASM        =$target{ec_obj}\n";
 print "DES_ENC       =$target{des_obj}\n";
 print "BN_ASM        =$target{bn_obj}\n";
 print "EC_ASM        =$target{ec_obj}\n";
 print "DES_ENC       =$target{des_obj}\n";


@@ -1955,27 +1915,43 @@ sub _add {
 
     my @values =
        map {
 
     my @values =
        map {

-           if (ref($_) eq "ARRAY") {
-               $found_array = 1;
-               @$_;
+           my $res = $_;
+           while (ref($res) eq "CODE") {
+               $res = $res->();
+           }
+           if (defined($res)) {
+               if (ref($res) eq "ARRAY") {
+                   $found_array = 1;
+                   @$res;
+               } else {
+                   $res;
+               }

            } else {
            } else {

-               $_;
+               ();

            }
     } (@_);
 
     if ($found_array) {
        [ @values ];
     } else {
            }
     } (@_);
 
     if ($found_array) {
        [ @values ];
     } else {

-       join($separator, @values);
+       join($separator, grep { defined($_) && $_ ne "" } @values);

     }
 }
 sub add_before {
     }
 }
 sub add_before {

-    my $separator = shift;
+    my $separator = " ";
+    if (ref($_[$#_]) eq "HASH") {
+        my $opts = pop;
+        $separator = $opts->{separator};
+    }

     my @x = @_;
     sub { _add($separator, @x, @_) };
 }
 sub add {
     my @x = @_;
     sub { _add($separator, @x, @_) };
 }
 sub add {

-    my $separator = shift;
+    my $separator = " ";
+    if (ref($_[$#_]) eq "HASH") {
+        my $opts = pop;
+        $separator = $opts->{separator};
+    }

     my @x = @_;
     sub { _add($separator, @_, @x) };
 }
     my @x = @_;
     sub { _add($separator, @_, @x) };
 }


@@ -2073,11 +2049,35 @@ sub resolve_config {
     #   value.
     # - Otherwise, this target's value is assumed to be a string that
     #   will simply override the inherited list of values.
     #   value.
     # - Otherwise, this target's value is assumed to be a string that
     #   will simply override the inherited list of values.

-    my $default_combiner = add(" ");
+    my $default_combiner = add();

 
     my %all_keys =
        map { $_ => 1 } (keys %combined_inheritance,
                         keys %{$table{$target}});
 
     my %all_keys =
        map { $_ => 1 } (keys %combined_inheritance,
                         keys %{$table{$target}});

+
+    sub process_values {
+       my $object    = shift;
+       my $inherited = shift;  # Always a [ list ]
+       my $target    = shift;
+       my $entry     = shift;
+
+        while(ref($object) eq "CODE") {
+            $object = $object->(@$inherited);
+        }
+        if (!defined($object)) {
+            return ();
+        }
+        elsif (ref($object) eq "ARRAY") {
+            return [ map { process_values($_, $inherited, $target, $entry) }
+                     @$object ];
+        } elsif (ref($object) eq "") {
+            return $object;
+        } else {
+            die "cannot handle reference type ",ref($object)
+                ," found in target ",$target," -> ",$entry,"\n";
+        }
+    }
+

     foreach (sort keys %all_keys) {
 
        # Current target doesn't have a value for the current key?
     foreach (sort keys %all_keys) {
 
        # Current target doesn't have a value for the current key?


@@ -2087,20 +2087,12 @@ sub resolve_config {
            $table{$target}->{$_} = $default_combiner;
        }
 
            $table{$target}->{$_} = $default_combiner;
        }
 

-       my $valuetype = ref($table{$target}->{$_});
-       if ($valuetype eq "CODE") {
-           # CODE reference, execute it with the inherited values as
-           # arguments.
-           $table{$target}->{$_} =
-               $table{$target}->{$_}->(@{$combined_inheritance{$_}});
-       } elsif ($valuetype eq "ARRAY" || $valuetype eq "") {
-           # ARRAY or Scalar, just leave it as is.
-       } else {
-           # Some other type of reference that we don't handle.
-           # Better to abort at this point.
-           die "cannot handle reference type $valuetype,"
-               ," found in target $target -> $_\n";
-       }
+       $table{$target}->{$_} = process_values($table{$target}->{$_},
+                                              $combined_inheritance{$_},
+                                              $target, $_);
+        unless(defined($table{$target}->{$_})) {
+            delete $table{$target}->{$_};
+        }

     }
 
     # Finally done, return the result.
     }
 
     # Finally done, return the result.


@@ -2175,22 +2167,12 @@ sub print_table_entry
        "cc",
        "cflags",
        "defines",
        "cc",
        "cflags",
        "defines",

-       "debug_cflags",
-       "debug_defines",
-       "release_cflags",
-       "release_defines",

        "thread_cflag",
        "unistd",
        "ld",
        "lflags",
        "plib_lflags",
        "ex_libs",
        "thread_cflag",
        "unistd",
        "ld",
        "lflags",
        "plib_lflags",
        "ex_libs",

-       "debug_lflags",
-       "debug_plib_lflags",
-       "debug_ex_libs",
-       "release_lflags",
-       "release_plib_lflags",
-       "release_ex_libs",

        "bn_ops",
        "cpuid_obj",
        "bn_obj",
        "bn_ops",
        "cpuid_obj",
        "bn_obj",


@@ -2230,14 +2212,24 @@ sub print_table_entry
     if ($type eq "TABLE") {
        print "\n";
        print "*** $target\n";
     if ($type eq "TABLE") {
        print "\n";
        print "*** $target\n";

-       printf "\$%-12s = %s\n", $_, $target{$_} foreach (@sequence);
+        foreach (@sequence) {
+            if (ref($target{$_}) eq "ARRAY") {
+                printf "\$%-12s = %s\n", $_, join(" ", @{$target{$_}});
+            } else {
+                printf "\$%-12s = %s\n", $_, $target{$_};
+            }
+        }

     } elsif ($type eq "HASH") {
        my $largest =
            length((sort { length($a) <=> length($b) } @sequence)[-1]);
        print "    '$target' => {\n";
        foreach (@sequence) {
            if ($target{$_}) {
     } elsif ($type eq "HASH") {
        my $largest =
            length((sort { length($a) <=> length($b) } @sequence)[-1]);
        print "    '$target' => {\n";
        foreach (@sequence) {
            if ($target{$_}) {

-               print "      '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
+                if (ref($target{$_}) eq "ARRAY") {
+                    print "      '",$_,"'"," " x ($largest - length($_))," => [ ",join(", ", map { "'$_'" } @{$target{$_}})," ],\n";
+                } else {
+                    print "      '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
+                }

            }
        }
        print "    },\n";
            }
        }
        print "    },\n";