- s, use, enable, for options name, avoiding conflicts with the names used in the...

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 5efd092..5967db1 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -24,9 +24,9 @@ CFGSET=true
 !MESSAGE   WITH_ZLIB=<dll or static>    - Enable ZLib support, DLL or static\r
 !MESSAGE   WITH_SSH2=<dll or static>    - Enable LIbSSH2 support, DLL or static\r
 !MESSAGE   USE_SSSPI=<yes or no>        - Enable SSPI support, default to yes\r
-!MESSAGE   USE_IPV6=<yes or no>         - Enable IPV6, default to yes\r
+!MESSAGE   ENABLE_IPV6=<yes or no>         - Enable IPV6, default to yes\r
 !MESSAGE   DEBUG=<yes or no>            - Debug builds\r
-!MESSAGE   USE_IDN=<yes or no>          - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.\r
+!MESSAGE   ENABLE_IDN=<yes or no>          - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.\r
 !MESSAGE                                  or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols release build)\r
 !ERROR please choose a valid mode\r
@@ -49,11 +49,13 @@ CURL_OBJS=$(CURL_OBJS:.c=.obj)
 USE_SSPI=true\r
 !ENDIF\r
 \r
-!IFNDEF USE_IPV6\r
-USE_IPV6=true\r
+!IFNDEF ENABLE_IPV6\r
+USE_IPV6   =true\r
+!ELSEIF "$(ENABLE_IPV6)"=="yes"\r
+USE_IPV6   =true\r
 !ENDIF\r
 \r
-!IFNDEF USE_IDN\r
+!IFNDEF ENABLE_IDN\r
 USE_IDN=true\r
 !ENDIF\r
 \r