From 0e27e967d00f5a35f56ae0b95f1d49a20a87cfef Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Thu, 29 Nov 2018 22:06:36 -0500
Subject: [PATCH] configure: fix handling build_dir and prefix options

---
 lib/rscons/application.rb | 10 ++++++----
 lib/rscons/cli.rb         |  5 +----
 spec/build_tests_spec.rb  |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/rscons/application.rb b/lib/rscons/application.rb
index 50e027a..b995f77 100644
--- a/lib/rscons/application.rb
+++ b/lib/rscons/application.rb
@@ -18,8 +18,6 @@ module Rscons
     def initialize
       @n_threads = determine_n_threads
       @vars = VarSet.new
-      @build_dir = "build"
-      @prefix = "/usr/local"
     end
 
     # Run the specified operation.
@@ -78,6 +76,9 @@ module Rscons
     #
     # @return [void]
     def configure(options)
+      # Default options.
+      options[:build_dir] ||= "build"
+      options[:prefix] ||= "/usr/local"
       cache = Cache.instance
       cache.configuration_data = {}
       if project_name = @script.project_name
@@ -85,9 +86,10 @@ module Rscons
       else
         $stdout.puts "Configuring project..."
       end
-      Ansi.write($stdout, "Setting build directory... ", :green, @build_dir, :reset, "\n")
+      Ansi.write($stdout, "Setting build directory... ", :green, options[:build_dir], :reset, "\n")
+      Ansi.write($stdout, "Setting prefix... ", :green, options[:prefix], :reset, "\n")
       rv = 0
-      co = ConfigureOp.new("#{@build_dir}/configure")
+      co = ConfigureOp.new("#{options[:build_dir]}/configure")
       begin
         @script.configure(co)
       rescue ConfigureOp::ConfigureFailure
diff --git a/lib/rscons/cli.rb b/lib/rscons/cli.rb
index fd42a3e..7906986 100644
--- a/lib/rscons/cli.rb
+++ b/lib/rscons/cli.rb
@@ -125,10 +125,7 @@ module Rscons
       end
 
       def parse_configure_args(argv)
-        options = {
-          build_dir: "build",
-          prefix: "/usr/local",
-        }
+        options = {}
         OptionParser.new do |opts|
           opts.banner = "Usage: #{$0} [options]"
 
diff --git a/spec/build_tests_spec.rb b/spec/build_tests_spec.rb
index 8cfad5d..dafef57 100644
--- a/spec/build_tests_spec.rb
+++ b/spec/build_tests_spec.rb
@@ -1874,8 +1874,7 @@ EOF
       expect(result.stderr).to eq ""
       expect(result.status).to eq 0
       expect(result.stdout).to match /Configuring configure test\.\.\./
-      #TODO
-      #expect(result.stdout).to match /Setting build directory\.\.\. bb/
+      expect(result.stdout).to match /Setting build directory\.\.\. bb/
       expect(result.stdout).to match /Checking for C compiler\.\.\. gcc/
       expect(result.stdout).to match /Checking for C\+\+ compiler\.\.\. g++/
       expect(result.stdout).to match /Checking for D compiler\.\.\. gdc/