diff options
| author | Guenter Knauf <lists@gknw.net> | 2012-04-13 13:17:57 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-06-11 19:00:35 +0200 |
| commit | 0bb5ff5d1a13f51344cdc666d08db7aefc4dc5a9 (patch) | |
| tree | 6b226d66b177260f903c62b9abc54fe96af260ae | |
| parent | 64dc957a41d7a2f00e2b5acc4a41e67dde00675e (diff) | |
schannel: Updated mingw32 makefiles
| -rw-r--r-- | lib/Makefile.m32 | 9 | ||||
| -rw-r--r-- | src/Makefile.m32 | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 988427e8f..abbcca3e0 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -115,6 +115,11 @@ endif ifeq ($(findstring -ipv6,$(CFG)),-ipv6) IPV6 = 1 endif +ifeq ($(findstring -schannel,$(CFG)),-schannel) +SCHANNEL = 1 +SSPI = 1 +SSL = 1 +endif INCLUDES = -I. -I../include CFLAGS += -DBUILDING_LIBCURL @@ -136,6 +141,9 @@ 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 @@ -163,6 +171,7 @@ ifdef SSL -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 diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 5aea90829..994161406 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -123,6 +123,11 @@ endif ifeq ($(findstring -metalink,$(CFG)),-metalink) METALINK = 1 endif +ifeq ($(findstring -schannel,$(CFG)),-schannel) +SCHANNEL = 1 +SSPI = 1 +SSL = 1 +endif INCLUDES = -I. -I.. -I../include -I../lib @@ -151,6 +156,9 @@ 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" @@ -169,6 +177,7 @@ ifdef SSL CFLAGS += -DUSE_SSLEAY curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) endif +endif ifdef ZLIB INCLUDES += -I"$(ZLIB_PATH)" CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H |