OpenSSL updates; get CA_BUNDLE from env. Assume no

Kerberos, have <pkcs12.h>, <engine.h> and built-in engines.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index f42a07fdbb388011e2af99cb51ecf5150c799255..b10106653321d4c84f65f3a23713dcc06b281863 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -29,7 +29,9 @@ INCLUDES = -I. -I../include
 CFLAGS = -g -O2 -DMINGW32 -DBUILDING_LIBCURL -DHAVE_LONGLONG
 ifdef SSL
   INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
-  CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
+  CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
+            -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \
+            -DCURL_CA_BUNDLE='getenv("CURL_CA_BUNDLE")'
   DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32
 endif
 ifdef ZLIB