From 0b19e15a1239bff9ae854f522f954206ec910cf8 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 20 Oct 2018 08:00:42 +0000
Subject: [PATCH] rename configure option `--disable-mjit` to
 `--disable-mjit-support`

* configure.ac: rename configure option `--disable-mjit` to
  `--disable-mjit-support` because `--disable-mjit` is ambiguous that
  runtime MJIT default enable option or supporting MJIT features.
  `ENABLE_MJIT` is also renamed to `MJIT_SUPPORT`

* Makefile.in: catch up this fix.

* common.mk: ditto.

* test/ruby/test_jit.rb: ditto.

* win32/Makefile.sub: catch up this fix on mswin.

* tool/mkconfig.rb: fix to pass `MJIT_SUPPORT` key.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 Makefile.in           |  2 +-
 common.mk             |  2 +-
 configure.ac          | 14 +++++++-------
 test/ruby/test_jit.rb |  2 +-
 tool/mkconfig.rb      |  1 +
 win32/Makefile.sub    |  4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d4d85735d2..73f0608544 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ XCFLAGS = @XCFLAGS@ $(MATHN:yes=-DCANONICALIZATION_FOR_MATHN)
 USE_RUBYGEMS = @USE_RUBYGEMS@
 USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=)
 CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1)
-ENABLE_MJIT = @ENABLE_MJIT@
+MJIT_SUPPORT = @MJIT_SUPPORT@
 MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
diff --git a/common.mk b/common.mk
index 2c5ad49f1a..e506bcd40a 100644
--- a/common.mk
+++ b/common.mk
@@ -201,7 +201,7 @@ all: $(SHOWFLAGS) main docs
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
-mjit-headers: $(ENABLE_MJIT)-mjit-headers
+mjit-headers: $(MJIT_SUPPORT)-mjit-headers
 no-mjit-headers: PHONY
 yes-mjit-headers: mjit_config.h PHONY
 
diff --git a/configure.ac b/configure.ac
index 5191a91eee..70d8ed9cc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3325,16 +3325,16 @@ AC_SUBST(CAPITARGET)
 AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
 AC_SUBST(INSTALLDOC)
 
-AC_ARG_ENABLE(mjit,
-        AS_HELP_STRING([--disable-mjit], [disable MJIT features]),
-        [ENABLE_MJIT=$enableval
-         AS_IF([test x"$enable_mjit" = "xyes"],
+AC_ARG_ENABLE(mjit-support,
+        AS_HELP_STRING([--disable-mjit-support], [disable MJIT features]),
+        [MJIT_SUPPORT=$enableval
+         AS_IF([test x"$enable_mjit_support" = "xyes"],
                  [AC_DEFINE(USE_MJIT, 1)],
                  [AC_DEFINE(USE_MJIT, 0)])],
-        [ENABLE_MJIT=yes
+        [MJIT_SUPPORT=yes
          AC_DEFINE(USE_MJIT, 1)])
 
-AC_SUBST(ENABLE_MJIT)
+AC_SUBST(MJIT_SUPPORT)
 
 AC_ARG_ENABLE(install-static-library,
 	AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]),
@@ -3997,7 +3997,7 @@ config_summary "debugflags"          "$debugflags"
 config_summary "warnflags"           "$warnflags"
 config_summary "strip command"       "$STRIP"
 config_summary "install doc"         "$install_doc"
-config_summary "enable MJIT"         "$ENABLE_MJIT"
+config_summary "MJIT support"        "$MJIT_SUPPORT"
 config_summary "man page type"       "$MANTYPE"
 config_summary "search path"         "$search_path"
 config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb
index 81308ec4c1..d34331c4f7 100644
--- a/test/ruby/test_jit.rb
+++ b/test/ruby/test_jit.rb
@@ -5,7 +5,7 @@ require_relative '../lib/jit_support'
 
 require 'rbconfig'
 
-return if RbConfig::CONFIG["ENABLE_MJIT"] == 'no'
+return if RbConfig::CONFIG["MJIT_SUPPORT"] == 'no'
 
 # Test for --jit option
 class TestJIT < Test::Unit::TestCase
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 2a3af97bc5..c3d3230d34 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -62,6 +62,7 @@ File.foreach "config.status" do |line|
     when /^(?:X|(?:MINI|RUN|(?:HAVE_)?BASE|BOOTSTRAP|BTEST)RUBY(?:_COMMAND)?$)/; next
     when /^INSTALLDOC|TARGET$/; next
     when /^DTRACE/; next
+    when /^MJIT_SUPPORT/; # pass
     when /^MJIT_/; next
     when /^(?:MAJOR|MINOR|TEENY)$/; vars[name] = val; next
     when /^LIBRUBY_D?LD/; next
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index f046d0bfcd..529dc78d5d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -302,8 +302,8 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
 !if "$(USE_RUBYGEMS)" == "no"
 CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS)
 !endif
-!ifndef INSTALL_MJIT_HEADER
-INSTALL_MJIT_HEADER = yes
+!ifndef MJIT_SUPPORT
+MJIT_SUPPORT = yes
 !endif
 !if "$(CPPOUTFLAG)" == ">"
 MJIT_HEADER_FLAGS =