Merge pull request #895 from SaberUK/master+configure-misc-cleanup

Various improvements to the build system.

2 files changed, 2 insertions, 1 deletions

diff --git a/tools/genssl b/tools/genssl
index 073caa8f4..13b1f01fc 100755
--- a/tools/genssl
+++ b/tools/genssl
@@ -35,6 +35,7 @@ use File::Temp();
 
 sub prompt($$) {
 	my ($question, $default) = @_;
+	return prompt_string(1, $question, $default) if eval 'use make::console; 1';
 	print "$question\n";
 	print "[$default] => ";
 	chomp(my $answer = <STDIN>);
diff --git a/tools/test-build b/tools/test-build
index 7f1bf68cd..85d63ccbe 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -29,8 +29,8 @@ BEGIN {
 use strict;
 use warnings FATAL => qw(all);
 
+use make::common;
 use make::configure;
-use make::utilities;
 
 $ENV{D} = $ENV{V} = 1;