moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

mingw32: Fixed warning of USE_SSL being redefined

Browse Source
This commit is contained in:
Marc Hoersken 2012-06-10 23:40:29 +02:00 committed by Daniel Stenberg
parent 61d152384e
commit 7da6a9128b
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Makefile.m32
View File

@ -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

8
src/Makefile.m32
View File

@ -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