3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a46301feff..7c7c74f65e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 28 18:14:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb: reconstruct comma separated list values.  a
+	  command line to Windows batch file is split not only by spaces
+	  and equal signs but also by commas and semicolons.
+
 Thu Mar 28 18:13:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* string.c (str_byte_substr): don't set coderange if it's not known.
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index f6f335182e..6d8751175e 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -113,7 +113,12 @@ File.foreach "config.status" do |line|
       end
     end
     if name == "configure_args"
-      val.gsub!(/ +(?!-)/, "=") if win32
+      if win32
+        val.gsub!(/\G(--[-a-z0-9]+)((=\S+)|(?:\s+(?!-)\S+)+)?(\s*)/) {
+          _, opt, list, arg, sep = *$~
+          "#{opt}#{arg || list && list.sub(/^\s+/, '=').tr_s(' ', ',')}#{sep}"
+        }
+      end
       val.gsub!(/--with-out-ext/, "--without-ext")
     elsif name == "libdir"
       v_runtime[:libdir] = val[/\$(\(exec_prefix\)|\{exec_prefix\})\/(.*)/, 2]
diff --git a/version.h b/version.h
index a50c7c6f2f..d4d7d197a2 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 396
+#define RUBY_PATCHLEVEL 397
 
 #define RUBY_RELEASE_DATE "2013-03-28"
 #define RUBY_RELEASE_YEAR 2013