summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-20 06:53:00 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-20 06:53:00 +0000
commitb710785f1aaaa06bd5cd2e7a584c24aff20c9ab4 (patch)
tree0f54465ac7315f016a281e371ca90666f0d0e369 /configure.ac
parentd79f72521e512a91955881de33be12464b9e3e4e (diff)
add disabling MJIT features option.
* configure.ac: introduce new configure option `--enable-mjit` and `--disable-mjit`. Default is "enable". `--disable-mjit` disables all of MJIT features so that `ruby --jit` can't enable MJIT. This option affect a macro `USE_MJIT`. This change remove `--enable/disable-install-mjit-header` option. * Makefile.in: introduce the `ENABLE_MJIT` variable. * common.mk: use `ENABLE_MJIT` option. * internal.h: respect `USE_MJIT`. Same as other *.c, *.h. * test/ruby/test_jit.rb: check `ENABLE_MJIT` key of rbconfg.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac16
1 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 40b209e..5191a91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3325,10 +3325,16 @@ AC_SUBST(CAPITARGET)
AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
AC_SUBST(INSTALLDOC)
-AC_ARG_ENABLE(install-mjit-header,
- AS_HELP_STRING([--disable-install-mjit-header], [do not install MJIT header]),
- [INSTALL_MJIT_HEADER=$enableval], [INSTALL_MJIT_HEADER=yes])
-AC_SUBST(INSTALL_MJIT_HEADER)
+AC_ARG_ENABLE(mjit,
+ AS_HELP_STRING([--disable-mjit], [disable MJIT features]),
+ [ENABLE_MJIT=$enableval
+ AS_IF([test x"$enable_mjit" = "xyes"],
+ [AC_DEFINE(USE_MJIT, 1)],
+ [AC_DEFINE(USE_MJIT, 0)])],
+ [ENABLE_MJIT=yes
+ AC_DEFINE(USE_MJIT, 1)])
+
+AC_SUBST(ENABLE_MJIT)
AC_ARG_ENABLE(install-static-library,
AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]),
@@ -3991,7 +3997,7 @@ config_summary "debugflags" "$debugflags"
config_summary "warnflags" "$warnflags"
config_summary "strip command" "$STRIP"
config_summary "install doc" "$install_doc"
-config_summary "install MJIT header" "$INSTALL_MJIT_HEADER"
+config_summary "enable MJIT" "$ENABLE_MJIT"
config_summary "man page type" "$MANTYPE"
config_summary "search path" "$search_path"
config_summary "static-linked-ext" ${EXTSTATIC:+"yes"}