mingw32: Fixed warning of USE_SSL being redefined
This commit is contained in:
Родитель
61d152384e
Коммит
7da6a9128b
|
@ -118,7 +118,6 @@ endif
|
|||
ifeq ($(findstring -schannel,$(CFG)),-schannel)
|
||||
SCHANNEL = 1
|
||||
SSPI = 1
|
||||
SSL = 1
|
||||
endif
|
||||
|
||||
INCLUDES = -I. -I../include
|
||||
|
@ -141,9 +140,6 @@ ifdef SSH2
|
|||
DLL_LIBS += -L"$(LIBSSH2_PATH)/win32" -lssh2
|
||||
endif
|
||||
ifdef SSL
|
||||
ifdef SCHANNEL
|
||||
CFLAGS += -DUSE_SSL -DUSE_SCHANNEL
|
||||
else
|
||||
ifndef OPENSSL_INCLUDE
|
||||
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
|
||||
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
|
||||
|
@ -171,7 +167,6 @@ else
|
|||
-DCURL_WANTS_CA_BUNDLE_ENV
|
||||
DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
|
||||
endif
|
||||
endif
|
||||
ifdef ZLIB
|
||||
INCLUDES += -I"$(ZLIB_PATH)"
|
||||
CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
|
||||
|
@ -191,6 +186,9 @@ endif
|
|||
ifdef SSPI
|
||||
CFLAGS += -DUSE_WINDOWS_SSPI
|
||||
DLL_LIBS += -lversion
|
||||
ifdef SCHANNEL
|
||||
CFLAGS += -DUSE_SCHANNEL
|
||||
endif
|
||||
endif
|
||||
ifdef SPNEGO
|
||||
CFLAGS += -DHAVE_SPNEGO
|
||||
|
|
|
@ -126,7 +126,6 @@ endif
|
|||
ifeq ($(findstring -schannel,$(CFG)),-schannel)
|
||||
SCHANNEL = 1
|
||||
SSPI = 1
|
||||
SSL = 1
|
||||
endif
|
||||
|
||||
INCLUDES = -I. -I.. -I../include -I../lib
|
||||
|
@ -156,9 +155,6 @@ ifdef SSH2
|
|||
curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2
|
||||
endif
|
||||
ifdef SSL
|
||||
ifdef SCHANNEL
|
||||
CFLAGS += -DUSE_SSL -DUSE_SCHANNEL
|
||||
else
|
||||
ifndef OPENSSL_LIBPATH
|
||||
OPENSSL_LIBS = -lssl -lcrypto
|
||||
ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out"
|
||||
|
@ -177,7 +173,6 @@ else
|
|||
CFLAGS += -DUSE_SSLEAY
|
||||
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
|
||||
endif
|
||||
endif
|
||||
ifdef ZLIB
|
||||
INCLUDES += -I"$(ZLIB_PATH)"
|
||||
CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
|
||||
|
@ -200,6 +195,9 @@ endif
|
|||
ifdef SSPI
|
||||
CFLAGS += -DUSE_WINDOWS_SSPI
|
||||
curl_LDADD += -lversion
|
||||
ifdef SCHANNEL
|
||||
CFLAGS += -DUSE_SCHANNEL
|
||||
endif
|
||||
endif
|
||||
ifdef SPNEGO
|
||||
CFLAGS += -DHAVE_SPNEGO
|
||||
|
|
Загрузка…
Ссылка в новой задаче