diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rwxr-xr-x | win32/configure.bat | 15 | ||||
| -rw-r--r-- | win32/setup.mak | 2 |
3 files changed, 25 insertions, 3 deletions
@@ -1,3 +1,14 @@ +Tue Dec 8 23:41:34 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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. + Tue Dec 8 23:39:52 2009 NAKAMURA Usaku <usa@ruby-lang.org> * numeric.c (flo_eq): supress a warning on VC++ for x64. diff --git a/win32/configure.bat b/win32/configure.bat index ad00266528..4c55271c74 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
diff --git a/win32/setup.mak b/win32/setup.mak index b6fb6acad3..f463fb26ec 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -53,7 +53,7 @@ RDOCTARGET = $(RDOCTARGET) EXTOUT = $(EXTOUT) !endif !if defined(BASERUBY) -BASERUBY = $(BASERUBY) +BASERUBY = $(BASERUBY:/=\) !endif !if defined(NTVER) NTVER = $(NTVER) |