From c9b28fd7ae5c5a79a74afebd5b191cfd2f31a65f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 15 May 2019 17:22:25 +0900
Subject: [PATCH] Allow --enable/--disable options to take an argument

[Bug #15850]
---
 lib/optparse/ac.rb             | 7 +++++--
 test/optparse/test_autoconf.rb | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/optparse/ac.rb b/lib/optparse/ac.rb
index fb0883f97a..9d520101aa 100644
--- a/lib/optparse/ac.rb
+++ b/lib/optparse/ac.rb
@@ -13,6 +13,8 @@ class OptionParser::AC < OptionParser
     end
   end
 
+  ARG_CONV = proc {|val| val.nil? ? true : val}
+
   def _ac_arg_enable(prefix, name, help_string, block)
     _check_ac_args(name, block)
 
@@ -20,8 +22,9 @@ class OptionParser::AC < OptionParser
     ldesc = ["--#{prefix}-#{name}"]
     desc = [help_string]
     q = name.downcase
-    enable = Switch::NoArgument.new(nil, proc {true}, sdesc, ldesc, nil, desc, block)
-    disable = Switch::NoArgument.new(nil, proc {false}, sdesc, ldesc, nil, desc, block)
+    ac_block = proc {|val| block.call(ARG_CONV.call(val))}
+    enable = Switch::PlacedArgument.new(nil, ARG_CONV, sdesc, ldesc, nil, desc, ac_block)
+    disable = Switch::NoArgument.new(nil, proc {false}, sdesc, ldesc, nil, desc, ac_block)
     top.append(enable, [], ["enable-" + q], disable, ['disable-' + q])
     enable
   end
diff --git a/test/optparse/test_autoconf.rb b/test/optparse/test_autoconf.rb
index 3be4a4c598..45f2ba09b2 100644
--- a/test/optparse/test_autoconf.rb
+++ b/test/optparse/test_autoconf.rb
@@ -32,6 +32,13 @@ class TestOptionParser::AutoConf < Test::Unit::TestCase
     assert_equal(true, @bar)
   end
 
+  def test_enable_value
+    @opt.parse!(%w"--enable-foo=A")
+    assert_equal("A", @foo)
+    @opt.parse!(%w"--enable-bar=B")
+    assert_equal("B", @bar)
+  end
+
   def test_disable
     @opt.parse!(%w"--disable-foo")
     assert_equal(false, @foo)