nobu	2018-06-22 13:13:02 +0900 (Fri, 22 Jun 2018)

  New Revision: 63718

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63718

  Log:
    remove DISABLE_RUBYGEMS from config files
    
    * configure.ac: removed DISABLE_RUBYGEMS macro from config.h, not
      to rebuild everything when the flag changed.
    
    * configure.ac, win32/configure.bat: make USE_RUBYGEMS lowercase.
    
    * tool/mkconfig.rb: remove RUBYGEMS stuff from rbconfig.rb, not to
      reconfigure and rebuild all extension libraries.
    
    * Makefile.in (CPPFLAGS): enable/disable Rubygems by USE_RUBYGEMS.

  Modified files:
    trunk/Makefile.in
    trunk/configure.ac
    trunk/tool/mkconfig.rb
    trunk/win32/Makefile.sub
    trunk/win32/configure.bat
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 63717)
+++ tool/mkconfig.rb	(revision 63718)
@@ -70,6 +70,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L70
     when /^arch$/; if val.empty? then val = arch else arch = val end
     when /^sitearch$/; val = '$(arch)' if val.empty?
     when /^DESTDIR$/; next
+    when /RUBYGEMS/; next
     end
     case val
     when /^\$\(ac_\w+\)$/; next
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 63717)
+++ Makefile.in	(revision 63718)
@@ -72,7 +72,9 @@ warnflags = @warnflags@ @strict_warnflag https://github.com/ruby/ruby/blob/trunk/Makefile.in#L72
 cppflags = @cppflags@
 MATHN = @MATHN@
 XCFLAGS = @XCFLAGS@ $(MATHN:yes=-DCANONICALIZATION_FOR_MATHN)
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
+USE_RUBYGEMS = @USE_RUBYGEMS@
+USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=)
+CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1)
 MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 63717)
+++ win32/Makefile.sub	(revision 63718)
@@ -299,6 +299,9 @@ LDSHARED_1 = @if exist $(@).manifest $(M https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L299
 LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest
 !endif
 CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
+!if "$(USE_RUBYGEMS)" == "no"
+CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS)
+!endif
 !if "$(CPPOUTFLAG)" == ">"
 MJIT_HEADER_FLAGS =
 !else
Index: win32/configure.bat
===================================================================
--- win32/configure.bat	(revision 63717)
+++ win32/configure.bat	(revision 63718)
@@ -143,12 +143,12 @@ goto :loop ; https://github.com/ruby/ruby/blob/trunk/win32/configure.bat#L143
   shift
 goto :loop ;
 :enable-rubygems
-  echo>> ~tmp~.mak 	"USE_RUBYGEMS=YES" \
+  echo>> ~tmp~.mak 	"USE_RUBYGEMS=yes" \
   echo>>confargs.tmp %1 \
   shift
 goto :loop ;
 :disable-rubygems
-  echo>> ~tmp~.mak 	"USE_RUBYGEMS=NO" \
+  echo>> ~tmp~.mak 	"USE_RUBYGEMS=no" \
   echo>>confargs.tmp %1 \
   shift
 goto :loop ;
Index: configure.ac
===================================================================
--- configure.ac	(revision 63717)
+++ configure.ac	(revision 63718)
@@ -3731,10 +3731,9 @@ AC_ARG_ENABLE(rubygems, https://github.com/ruby/ruby/blob/trunk/configure.ac#L3731
 	AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
 	[enable_rubygems="$enableval"], [enable_rubygems=yes])
 AS_IF([test x"$enable_rubygems" = xno], [
-    AC_DEFINE(DISABLE_RUBYGEMS, 1)
-    USE_RUBYGEMS=NO
+    USE_RUBYGEMS=no
 ], [
-    USE_RUBYGEMS=YES
+    USE_RUBYGEMS=yes
 ])
 AC_SUBST(USE_RUBYGEMS)
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/