[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  95b2ebdf99a5fbf9e1f3f71a5ebd9728d57addf5 (commit)
      from  d918f9cb2d105675728af8be1e14d23208200c24 (commit)


- Log -----------------------------------------------------------------
commit 95b2ebdf99a5fbf9e1f3f71a5ebd9728d57addf5
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 17 03:23:04 2016 +0100

    When someone configures an out-of-source build, switch to unified
    
    For example, this works instead of giving a big error message (note
    the lack of '--unified'):
    
        mkdir ../_build
        (cd ../_build/; ../openssl-src/config; make)
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Configure b/Configure
index 74ebfb1..58c0f7d 100755
--- a/Configure
+++ b/Configure
@@ -885,9 +885,10 @@ $target{build_scheme} = [ $target{build_scheme} ]
 ###### 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) {
+    && ($unified || $srcdir ne $blddir)) {
     $target{build_scheme} = [ "unified", "unix" ];
 }
 
@@ -1704,13 +1705,6 @@ EOF
 print OUT "1;\n";
 close(OUT);
 
-die <<"EOF" if $builder ne "unified" && $srcdir ne $blddir;
-
-***** Trying building anywhere else than in the source tree will not
-***** work for target $config{target}.  To make it possible, it needs
-***** to use the "unified" build scheme.
-
-EOF
 
 print "IsMK1MF       =", ($builder eq "mk1mf" ? "yes" : "no"), "\n";
 print "CC            =$target{cc}\n";