* Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,

  setup.mak}: add --with-baseruby configure option.


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

3 files changed, 15 insertions, 0 deletions

diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index baff3e3947..8f32b4c936 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -55,6 +55,9 @@ YFLAGS = -o y.tab.c
 !ifndef AR
 AR = tlib
 !endif
+!ifndef BASERUBY
+BASERUBY = ruby
+!endif
 
 PURIFY =
 AUTOCONF = autoconf
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 6e3056ff38..6e32df6fc7 100755
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -21,6 +21,7 @@ if "%1" == "--program-name" goto :progname
 if "%1" == "--enable-install-doc" goto :enable-rdoc

 if "%1" == "--disable-install-doc" goto :disable-rdoc

 if "%1" == "--extout" goto :extout

+if "%1" == "--with-baseruby" goto :baseruby

 if "%1" == "-h" goto :help

 if "%1" == "--help" goto :help

   echo>> ~tmp~.mak 	"%1" \

@@ -73,6 +74,11 @@ goto :loop
   shift

   shift

 goto :loop

+:baseruby

+  echo>> ~tmp~.mak 	-D"BASERUBY=%2" \

+  shift

+  shift

+goto :loop

 :help

   echo Configuration:

   echo   --help                  display this help

@@ -82,6 +88,7 @@ goto :loop
   echo System types:

   echo   --target=TARGET         configure for TARGET [i386-bccwin32]

   echo Optional Package:

+  echo   --with-baseruby=RUBY    use RUBY as baseruby [ruby]

   echo   --with-static-linked-ext link external modules statically

   echo   --disable-install-doc   do not install rdoc indexes during install

   del ~tmp~.mak

diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 8f73b4f9f7..d52fc4b95a 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -53,6 +53,11 @@ $(BANG)ifndef EXTOUT
 EXTOUT = $(EXTOUT)
 $(BANG)endif
 !endif
+!if defined(BASERUBY)
+$(BANG)ifndef BASERUBY
+BASERUBY = $(BASERUBY)
+$(BANG)endif
+!endif
 |
 	@type > usebormm.bat &&|
 @echo off