diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2012-06-10 23:40:29 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-06-11 19:00:37 +0200 |
| commit | 7da6a9128b0653790d839f5f708f9caa2633e332 (patch) | |
| tree | d2f168ea2b16f9eb9baeddaa34111fda3e572367 | |
| parent | 61d152384e71a152dfbcfb7c18bb5fed753c7435 (diff) | |
mingw32: Fixed warning of USE_SSL being redefined
| -rw-r--r-- | lib/Makefile.m32 | 8 | ||||
| -rw-r--r-- | src/Makefile.m32 | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 11f6d7100..fd191c119 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -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 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 |