diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | win32/configure.bat | 16 |
2 files changed, 18 insertions, 5 deletions
@@ -1,8 +1,13 @@ +Thu Aug 23 12:30:20 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/configure.bat: support --with(out)?-ext(ensions) options. + Thu Aug 23 11:52:04 2012 NARUSE, Yui <naruse@ruby-lang.org> * configure.in: Fixing Haiku build. - -lbe is not required for linking - - stack protector doesn't work for now because of the default gcc's bug + - stack protector doesn't work for now because of the default gcc's + bug by Takashi Toyoshima <toyoshim@gmail.com> https://github.com/ruby/ruby/pull/167 diff --git a/win32/configure.bat b/win32/configure.bat index 17879eb57a..a8c5a7cb37 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -32,11 +32,19 @@ 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
+if not errorlevel 1 goto :witharg
echo %1| findstr "^--with-.*-include$" > nul
-if not errorlevel 1 goto :withdir
+if not errorlevel 1 goto :witharg
echo %1| findstr "^--with-.*-lib$" > nul
-if not errorlevel 1 goto :withdir
+if not errorlevel 1 goto :witharg
+echo %1| findstr "^--with-ext$" > nul
+if not errorlevel 1 goto :witharg
+echo %1| findstr "^--with-extensions$" > nul
+if not errorlevel 1 goto :witharg
+echo %1| findstr "^--without-ext$" > nul
+if not errorlevel 1 goto :witharg
+echo %1| findstr "^--without-extensions$" > nul
+if not errorlevel 1 goto :witharg
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
echo>>confargs.tmp %1 \
@@ -148,7 +156,7 @@ goto :loop shift
shift
goto :loop
-:withdir
+:witharg
echo>>confargs.tmp %1=%2 \
shift
shift
|