aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.m32
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.m32')
-rw-r--r--src/Makefile.m328
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 80fa81b01..2186326b6 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -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