nobu	2017-04-10 10:22:49 +0900 (Mon, 10 Apr 2017)

  New Revision: 58296

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

  Log:
    Allow --without-baseruby option
    
    * configure.in, win32/configure.bat: allow --without-baseruby
      option to use already generated files without baseruby.

  Modified files:
    trunk/configure.in
    trunk/win32/configure.bat
Index: configure.in
===================================================================
--- configure.in	(revision 58295)
+++ configure.in	(revision 58296)
@@ -39,18 +39,19 @@ rm() { https://github.com/ruby/ruby/blob/trunk/configure.in#L39
 
 AC_ARG_WITH(baseruby,
 	AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
-	[
-		AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)])
+	[AS_CASE(["$withval"],
+	    [*ruby*],[BASERUBY=$withval; HAVE_BASERUBY=yes],
+	    [no],[HAVE_BASERUBY=no],
+	    [AC_MSG_ERROR(need ruby)])
 	],
 	[
 		AC_PATH_PROG([BASERUBY], [ruby], [false])
 	])
-if test "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42; then
+if test "$HAVE_BASERUBY" = yes -a "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42; then
     if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42; then
 	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
Index: win32/configure.bat
===================================================================
--- win32/configure.bat	(revision 58295)
+++ win32/configure.bat	(revision 58296)
@@ -39,6 +39,7 @@ if "%1" == "--disable-rubygems" goto :di https://github.com/ruby/ruby/blob/trunk/win32/configure.bat#L39
 if "%1" == "--extout" goto :extout
 if "%1" == "--path" goto :path
 if "%1" == "--with-baseruby" goto :baseruby
+if "%1" == "--without-baseruby" goto :baseruby
 if "%1" == "--with-ntver" goto :ntver
 if "%1" == "--with-libdir" goto :libdir
 if "%1" == "--with-git" goto :git
@@ -175,6 +176,11 @@ goto :loop ; https://github.com/ruby/ruby/blob/trunk/win32/configure.bat#L176
   shift
   shift
 goto :loop ;
+:nobaseruby
+  echo>> ~tmp~.mak 	"HAVE_BASERUBY=no" \
+  echo>>confargs.tmp  %1=%2 \
+  shift
+goto :loop ;
 :libdir
   echo>> ~tmp~.mak 	"libdir_basename=%~2" \
   echo>>confargs.tmp  %1=%2 \

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