Allow --without-baseruby option

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 11 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index c68a082be7..75ecfaf8eb 100644
--- a/configure.in
+++ b/configure.in
@@ -39,18 +39,19 @@ rm() {
 
 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
diff --git a/win32/configure.bat b/win32/configure.bat
index 18c9d95963..7246362372 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -39,6 +39,7 @@ if "%1" == "--disable-rubygems" goto :disable-rubygems
 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 ;
   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 \