extmod/modussl_axtls: Further changes to allow alternative SSL modules.

pfalcon · pfalcon · commit 20283aec107d · 2016-07-13T01:49:38.000+03:00
Make variable MICROPY_SSL_AXTLS=1 should be defined to activate modussl_axtls
and link with -laxtls.
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 
-#if MICROPY_PY_USSL
+#if MICROPY_PY_USSL && MICROPY_SSL_AXTLS
 
 #include "ssl.h"
 
diff --git a/py/py.mk b/py/py.mk
@@ -20,9 +20,12 @@ INC += -I../lib
 INC += -I../lib/netutils
 
 ifeq ($(MICROPY_PY_USSL),1)
-CFLAGS_MOD += -DMICROPY_PY_USSL=1 -I../lib/axtls/ssl -I../lib/axtls/crypto -I../lib/axtls/config
+CFLAGS_MOD += -DMICROPY_PY_USSL=1
+ifeq ($(MICROPY_SSL_AXTLS),1)
+CFLAGS_MOD += -DMICROPY_SSL_AXTLS=1 -I../lib/axtls/ssl -I../lib/axtls/crypto -I../lib/axtls/config
 LDFLAGS_MOD += -L../lib/axtls/_stage -laxtls
 endif
+endif
 
 #ifeq ($(MICROPY_PY_LWIP),1)
 #CFLAGS_MOD += -DMICROPY_PY_LWIP=1 -I../lib/lwip/src/include -I../lib/lwip/src/include/ipv4 -I../extmod/lwip-include
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
@@ -111,7 +111,7 @@
 #define MICROPY_PY_URE              (1)
 #define MICROPY_PY_UHEAPQ           (1)
 #define MICROPY_PY_UHASHLIB         (1)
-#if MICROPY_PY_USSL
+#if MICROPY_PY_USSL && MICROPY_SSL_AXTLS
 #define MICROPY_PY_UHASHLIB_SHA1    (1)
 #endif
 #define MICROPY_PY_UBINASCII        (1)
diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk
@@ -28,6 +28,7 @@ MICROPY_PY_FFI = 1
 
 # ussl module requires axtls
 MICROPY_PY_USSL = 1
+MICROPY_SSL_AXTLS = 1
 
 # jni module requires JVM/JNI
 MICROPY_PY_JNI = 0
