summaryrefslogtreecommitdiff
path: root/win32/configure.bat
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-08 14:53:55 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-08 14:53:55 +0000
commit0f406d278fce4909940ed52df2009b18fee2c22a (patch)
tree5b7e126d28dff360d52eade51f9e883f533a3ec8 /win32/configure.bat
parentdd00d45244fd58fc1f5bf9c110bf48fb4ccf37b8 (diff)
* win32/configure.bat: now recognize --with-*-{dir,include,lib} options
and pass them to mkmf. * win32/configure.bat: general conversion from ``/'' to ``\'' of configure_args is not necessary any longer. * win32/setup.mak: BASERUBY is used as command, so always need to convert ``/'' to ``\'' within it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/configure.bat')
-rwxr-xr-xwin32/configure.bat15
1 files changed, 13 insertions, 2 deletions
diff --git a/win32/configure.bat b/win32/configure.bat
index ad002665285..4c55271c74d 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -5,7 +5,7 @@
echo> ~tmp~.mak ####
echo>> ~tmp~.mak conf = %0
-echo>> ~tmp~.mak $(conf:\=/): nul
+echo>> ~tmp~.mak $(conf): nul
echo>> ~tmp~.mak @del ~setup~.mak
echo>> ~tmp~.mak @-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \
if exist pathlist.tmp del pathlist.tmp
@@ -30,9 +30,15 @@ if "%1" == "--disable-win95" goto :disable-win95
if "%1" == "--extout" goto :extout
if "%1" == "--path" goto :path
if "%1" == "--with-baseruby" goto :baseruby
+if "%1" == "--with-ntver" goto :ntver
+echo %1| findstr "^--with-.*-dir$" > nul
+if not errorlevel 1 goto :withdir
+echo %1| findstr "^--with-.*-include$" > nul
+if not errorlevel 1 goto :withdir
+echo %1| findstr "^--with-.*-lib$" > nul
+if not errorlevel 1 goto :withdir
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
-if "%1" == "--with-ntver" goto :ntver
echo>>confargs.tmp %1 \
shift
goto :loop
@@ -132,6 +138,11 @@ goto :loop
shift
shift
goto :loop
+:withdir
+ echo>>confargs.tmp %1=%2 \
+ shift
+ shift
+goto :loop
:help
echo Configuration:
echo --help display this help