Commit 39b25ee2 authored by Richard Levitte's avatar Richard Levitte
Browse files

Revert "unified build scheme: Try to nudge users to try the "unified" build" 



This reverts commit 242ffb05.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent fa22f98f

Configure

+1 −49
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ my $no_sse2=0; 


my $user_cflags="";

my @user_defines=();

my $unified = 0;

$config{openssl_api_defines}=[];

$config{openssl_algorithm_defines}=[];

$config{openssl_thread_defines}=[];
@@ -632,11 +631,7 @@ foreach (@argvcopy) 
		}

	elsif (/^[-+]/)

		{

		if (/^--unified$/)

			{

			$unified=1;

			}

		elsif (/^--prefix=(.*)$/)

		if (/^--prefix=(.*)$/)

			{

			$config{prefix}=$1;

			die "Directory given with --prefix MUST be absolute\n"
@@ -891,16 +886,6 @@ $config{shared_ldflag} = ""; 
$target{build_scheme} = [ $target{build_scheme} ]

    if ref($target{build_scheme}) ne "ARRAY";



###### TO BE REMOVED BEFORE FINAL RELEASE

######

###### 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" ];

}



my ($builder, $builder_platform, @builder_opts) =

    @{$target{build_scheme}};
@@ -1913,39 +1898,6 @@ or position independent code, please let us know (but please first make sure 
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);



######################################################################