Revert "Update to 7.40.1"

[platform/upstream/curl.git] / winbuild / MakefileBuild.vc

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 985c1bc..828fe4f 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -121,27 +121,6 @@ SSL          = static
 SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"\r
 !ENDIF\r
 \r
-!IF "$(WITH_CARES)"=="dll"\r
-!IF "$(DEBUG)"=="yes"\r
-CARES_LIBS     = caresd.lib\r
-!ELSE\r
-CARES_LIBS     = cares.lib\r
-!ENDIF\r
-USE_CARES      = true\r
-CARES          = dll\r
-!ELSEIF "$(WITH_CARES)"=="static"\r
-!IF "$(DEBUG)"=="yes"\r
-CARES_LIBS     = libcaresd.lib\r
-!ELSE\r
-CARES_LIBS     = libcares.lib\r
-!ENDIF\r
-USE_CARES      = true\r
-CARES          = static\r
-!ENDIF\r
-\r
-!IFDEF USE_CARES\r
-CARES_CFLAGS   = /DUSE_ARES /I"$(DEVEL_INCLUDE)/cares"\r
-!ENDIF\r
 \r
 !IF "$(WITH_ZLIB)"=="dll"\r
 ZLIB_LIBS   = zlib.lib\r
@@ -208,6 +187,17 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
 !ENDIF\r
 \r
 \r
+!IFNDEF USE_SPNEGO\r
+USE_SPNEGO  = true\r
+!ELSEIF "$(USE_SPNEGO)"=="yes"\r
+USE_SPNEGO  = true\r
+!ENDIF\r
+\r
+!IF "$(USE_SPNEGO)"=="true"\r
+SPNEGO_CFLAGS = $(SPNEGO_CFLAGS) /DHAVE_SPNEGO\r
+!ENDIF\r
+\r
+\r
 !IFNDEF USE_WINSSL\r
 !IF "$(USE_SSL)"=="true"\r
 USE_WINSSL  = false\r
@@ -318,11 +308,6 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS)
 LFLAGS = $(LFLAGS) $(SSL_LFLAGS) $(SSL_LIBS)\r
 !ENDIF\r
 \r
-!IF "$(USE_CARES)"=="true"\r
-CFLAGS = $(CFLAGS) $(CARES_CFLAGS)\r
-LFLAGS = $(LFLAGS) $(CARES_LFLAGS) $(CARES_LIBS)\r
-!ENDIF\r
-\r
 !IF "$(USE_ZLIB)"=="true"\r
 CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS)\r
 LFLAGS = $(LFLAGS) $(ZLIB_LFLAGS) $(ZLIB_LIBS)\r
@@ -345,6 +330,10 @@ CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)
 CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)\r
 !ENDIF\r
 \r
+!IF "$(USE_SPNEGO)"=="true"\r
+CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)\r
+!ENDIF\r
+\r
 !IF "$(GEN_PDB)"=="true"\r
 CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"\r
 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)\r
@@ -402,12 +391,12 @@ package: $(TARGET)
 \r
 $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)\r
        @echo Using SSL: $(USE_SSL)\r
-       @echo Using c-ares: $(USE_CARES)\r
        @echo Using SSH2: $(USE_SSH2)\r
        @echo Using ZLIB: $(USE_ZLIB)\r
        @echo Using IDN:  $(USE_IDN)\r
        @echo Using IPv6: $(USE_IPV6)\r
        @echo Using SSPI: $(USE_SSPI)\r
+       @echo Using SPNEGO: $(USE_SPNEGO)\r
        @echo Using WinSSL: $(USE_WINSSL)\r
        @echo CFLAGS:     $(CFLAGS)\r
        @echo LFLAGS:     $(LFLAGS)\r