1 files changed, 28 insertions, 10 deletions
diff --git a/win32/configure.bat b/win32/configure.bat
index 573f8bf0e5..dd1a917adc 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -7,6 +7,9 @@ for %%I in (%0) do if /%%~dpI/ == /%CD%\/ (
     exit /b 999
 )
 
+set XINCFLAGS=
+set XLDFLAGS=
+
 echo> ~tmp~.mak ####
 echo>> ~tmp~.mak conf = %0
 echo>> ~tmp~.mak $(conf): nul
@@ -34,10 +37,10 @@ if "%1" == "--enable-install-static-library" goto :enable-lib
 if "%1" == "--disable-install-static-library" goto :disable-lib
 if "%1" == "--enable-debug-env" goto :enable-debug-env
 if "%1" == "--disable-debug-env" goto :disable-debug-env
+if "%1" == "--enable-devel" goto :enable-devel
+if "%1" == "--disable-devel" goto :disable-devel
 if "%1" == "--enable-rubygems" goto :enable-rubygems
 if "%1" == "--disable-rubygems" goto :disable-rubygems
-if "%1" == "--enable-mjit-support" goto :enable-mjit-support
-if "%1" == "--disable-mjit-support" goto :disable-mjit-support
 if "%1" == "--extout" goto :extout
 if "%1" == "--path" goto :path
 if "%1" == "--with-baseruby" goto :baseruby
@@ -48,6 +51,9 @@ if "%1" == "--with-git" goto :git
 if "%1" == "--without-git" goto :nogit
 if "%1" == "--without-ext" goto :witharg
 if "%1" == "--without-extensions" goto :witharg
+if "%1" == "--with-opt-dir" goto :opt-dir
+if "%1" == "--with-gmp" goto :gmp
+if "%1" == "--with-gmp-dir" goto :gmp-dir
 if "%opt:~0,10%" == "--without-" goto :withoutarg
 if "%opt:~0,7%" == "--with-" goto :witharg
 if "%1" == "-h" goto :help
@@ -143,23 +149,23 @@ goto :loop ;
   echo>>confargs.tmp  %1 \
   shift
 goto :loop ;
-:enable-rubygems
-  echo>> ~tmp~.mak 	"USE_RUBYGEMS=yes" \
+:enable-devel
+  echo>> ~tmp~.mak 	"RUBY_DEVEL=yes" \
   echo>>confargs.tmp  %1 \
   shift
 goto :loop ;
-:disable-rubygems
-  echo>> ~tmp~.mak 	"USE_RUBYGEMS=no" \
+:disable-devel
+  echo>> ~tmp~.mak 	"RUBY_DEVEL=no" \
   echo>>confargs.tmp  %1 \
   shift
 goto :loop ;
-:enable-mjit-support
-  echo>> ~tmp~.mak 	"MJIT_SUPPORT=yes" \
+:enable-rubygems
+  echo>> ~tmp~.mak 	"USE_RUBYGEMS=yes" \
   echo>>confargs.tmp  %1 \
   shift
 goto :loop ;
-:disable-mjit-support
-  echo>> ~tmp~.mak 	"MJIT_SUPPORT=no" \
+:disable-rubygems
+  echo>> ~tmp~.mak 	"USE_RUBYGEMS=no" \
   echo>>confargs.tmp  %1 \
   shift
 goto :loop ;
@@ -210,6 +216,16 @@ goto :loop ;
   echo>>confargs.tmp  %1 \
   shift
 goto :loop ;
+:gmp
+  echo>> ~tmp~.mak 	"WITH_GMP=yes" \
+  echo>>confargs.tmp  %1=1 \
+  shift
+  shift
+goto :loop ;
+:gmp-dir
+:opt-dir
+  set XINCFLAGS=%XINCFLAGS% -I%2/include
+  set XLDFLAGS=%XLDFLAGS% -libpath:%2/lib
 :witharg
   echo>>confargs.tmp  %1=%2\
   set witharg=1
@@ -256,6 +272,8 @@ cl -EP confargs.c > ~setup~.mak 2>nul
 if exist pathlist.tmp echo>>~setup~.mak PATH = $(pathlist:;=/bin;)$(PATH)
 if exist pathlist.tmp echo>>~setup~.mak INCLUDE = $(pathlist:;=/include;)
 if exist pathlist.tmp echo>>~setup~.mak LIB = $(pathlist:;=/lib;)
+echo>>~setup~.mak XINCFLAGS = %XINCFLAGS%
+echo>>~setup~.mak XLDFLAGS = %XLDFLAGS%
 type>>~setup~.mak ~tmp~.mak
 del *.tmp > nul
 del ~tmp~.mak > nul