From 7da6a9128b0653790d839f5f708f9caa2633e332 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Sun, 10 Jun 2012 23:40:29 +0200
Subject: mingw32: Fixed warning of USE_SSL being redefined

---
 lib/Makefile.m32 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib/Makefile.m32')

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
-- 
cgit v1.2.3