"md5",
"mdc2",
"md[-_]ghost94",
+ "multiblock",
"nextprotoneg",
"ocb",
"ocsp",
my $user_cflags="";
my @user_defines=();
-my $unified = 0;
$config{openssl_api_defines}=[];
$config{openssl_algorithm_defines}=[];
$config{openssl_thread_defines}=[];
$config{options}="";
$config{build_type} = "release";
+my $classic = 0;
+
my @argvcopy=@ARGV;
if (grep /^reconf(igure)?$/, @argvcopy) {
}
elsif (/^[-+]/)
{
- if (/^--unified$/)
+ if (/^--classic$/)
{
- $unified=1;
+ $classic=1;
}
elsif (/^--prefix=(.*)$/)
{
$target{build_scheme} = [ $target{build_scheme} ]
if ref($target{build_scheme}) ne "ARRAY";
-###### TO BE REMOVED BEFORE FINAL RELEASE
+###### TO BE REMOVED WHEN CLASSIC BUILD IS REMOVED
######
-###### If the user has chosen --unified, we give it to them.
-###### The same happens if we detect that they try to build out-of-source.
-if ($target{build_file} eq "Makefile"
- && $target{build_scheme}->[0] eq "unixmake"
- && ($unified || $srcdir ne $blddir)) {
- $target{build_scheme} = [ "unified", "unix" ];
+###### If the user has chosen --classic, we give it to them.
+###### If they try that with an out-of-source config, we complain.
+if ($target{build_scheme}->[0] eq "unified" && $classic) {
+ die "Can't perform a classic build out of source tree\n"
+ if $srcdir ne $blddir;
+
+ $target{build_scheme} = { unix => [ "unixmake" ],
+ windows => [ "mk1mf", $target{build_scheme}->[2] ],
+ VMS => undef } -> {$target{build_scheme}->[1]};
+
+ die "Classic mode unavailable on this platform\n"
+ unless defined($target{build_scheme});
}
my ($builder, $builder_platform, @builder_opts) =
you have tried with a current version of OpenSSL).
EOF
-###### TO BE REMOVED BEFORE FINAL RELEASE
-######
-###### If the user hasn't chosen --unified, try to nudge them.
-if ($target{build_file} eq "Makefile"
- && $target{build_scheme}->[0] eq "unixmake"
- && !$unified) {
-
- my $plausible_builddir =
- abs2rel(rel2abs("../_openssl-build_$target"),rel2abs("."));
- my $plausible_to_sourcedir =
- abs2rel(rel2abs("."),rel2abs("../_openssl-build_$target"));
- print <<"EOF";
-
-----------------------------------------------------------------------
-Please consider configuring with the flag --unified .
-It's to test out a new "unified" building system.
-
-One cool feature is that you can have your build directory elsewhere,
-for example:
-
- make clean # Clean the current configuration away
- mkdir $plausible_builddir
- cd $plausible_builddir
- $plausible_to_sourcedir/config --unified
- make
- make test
-
-Please report any problem you have.
-----------------------------------------------------------------------
-
-EOF
-}
-
exit(0);
######################################################################