nobu	2014-11-06 19:53:04 +0900 (Thu, 06 Nov 2014)

  New Revision: 48298

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

  Log:
    reaply r48278

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/win32/setup.mak
Index: configure.in
===================================================================
--- configure.in	(revision 48297)
+++ configure.in	(revision 48298)
@@ -46,10 +46,13 @@ if test "`RUBYOPT=- $BASERUBY -e 'p 42' https://github.com/ruby/ruby/blob/trunk/configure.in#L46
 	BASERUBY="$BASERUBY --disable=gems"
     fi
     $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
+    HAVE_BASERUBY=yes
 else
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+    HAVE_BASERUBY=no
 fi
 AC_SUBST(BASERUBY)
+AC_SUBST(HAVE_BASERUBY)
 
 AC_DEFUN([RUBY_MINGW32],
 [AS_CASE(["$host_os"],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48297)
+++ ChangeLog	(revision 48298)
@@ -60,6 +60,12 @@ Wed Nov  5 15:05:12 2014  Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ChangeLog#L60
 	  NUL-terminate the result string, in the future, so it will not
 	  be needed in other cases.
 
+Wed Nov  5 14:11:30 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (lib/unicode_normalize/tables.rb): do nothing unless
+	  BASERUBY is available.  MINIRUBY cannot load extension libraries,
+	  so cannot update Unicode data.
+
 Wed Nov  5 12:13:54 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by
Index: common.mk
===================================================================
--- common.mk	(revision 48297)
+++ common.mk	(revision 48298)
@@ -1124,7 +1124,7 @@ download-unicode-data: ./.unicode-$(UNIC https://github.com/ruby/ruby/blob/trunk/common.mk#L1124
 	    $(UNICODE_VERSION)/ucd/NormalizationTest.txt
 	@exit > $@
 
-$(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time
+$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): ./.unicode-tables.time
 
 ./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
 		$(UNICODE_FILES) $(UNICODE_FILES_DEPS) \
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 48297)
+++ win32/setup.mak	(revision 48298)
@@ -66,7 +66,14 @@ USE_RUBYGEMS = $(USE_RUBYGEMS) https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L66
 	@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE)
 	@echo !if "$$(BASERUBY)" == "">> $(MAKEFILE)
 	@echo BASERUBY = echo executable host ruby is required.  use --with-baseruby option.^& exit 1 >> $(MAKEFILE)
+	@echo HAVE_BASERUBY = no>> $(MAKEFILE)
+	@echo !else>> $(MAKEFILE)
+	@echo HAVE_BASERUBY = yes>> $(MAKEFILE)
 	@echo !endif>> $(MAKEFILE)
+!elseif [$(BASERUBY) -eexit 2> nul] == 0
+	@echo HAVE_BASERUBY = yes>> $(MAKEFILE)
+!else
+	@echo HAVE_BASERUBY = no>> $(MAKEFILE)
 !endif
 
 -system-vars-: -osname- -runtime- -headers-
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 48297)
+++ Makefile.in	(revision 48298)
@@ -25,6 +25,7 @@ AUTOCONF = autoconf https://github.com/ruby/ruby/blob/trunk/Makefile.in#L25
 @SET_MAKE@
 MKFILES = @MAKEFILES@
 BASERUBY = @BASERUBY@
+HAVE_BASERUBY = @HAVE_BASERUBY@
 TEST_RUNNABLE = @TEST_RUNNABLE@
 CROSS_COMPILING = @CROSS_COMPILING@
 DOXYGEN = @DOXYGEN@

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