From 95b2ebdf99a5fbf9e1f3f71a5ebd9728d57addf5 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 17 Feb 2016 03:23:04 +0100 Subject: [PATCH] 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 --- Configure | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Configure b/Configure index 74ebfb1d45..58c0f7d0c2 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"; -- 2.25.1