From 0a72449f4bf189cd2fb9e69d72fe582420957a21 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 3 Mar 2019 16:09:09 +0000
Subject: Allow for building against AmiSSL instead of OpenSSL

---
 frontends/amiga/Makefile          |  5 ++++-
 frontends/amiga/Makefile.defaults | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 858492203..b71ae3cf9 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,11 +12,12 @@ endif
 
 $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
 $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
 
 CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
 CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
 
-LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
+#LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
 LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
 LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
 
@@ -24,6 +25,8 @@ LDFLAGS += -lpbl -liconv
 
 ifeq ($(SUBTARGET),os3)
   LDFLAGS += -lamiga -lm
+else
+  LDFLAGS += -lpthread
 endif
 
 EXETARGET := NetSurf
diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults
index f19d6e394..2d5cec70c 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -6,6 +6,12 @@
 # Valid options: YES, NO
 NETSURF_USE_LIBICONV_PLUG := NO
 
+# Use AmiSSL for secure connections.
+# Either this or NETSURF_USE_OPENSSL should be specified, not both.
+# libcurl must have been built against the same library.
+# Valid options: YES, NO
+NETSURF_USE_AMISSL := NO
+
 # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
 # Valid options: YES, NO, AUTO
 NETSURF_USE_ROSPRITE := NO
@@ -30,3 +36,9 @@ NETSURF_FS_BACKING_STORE := YES
 # Optimisation levels
 CFLAGS += -fomit-frame-pointer -gstabs
 
+# Target-specific
+ifeq ($(SUBTARGET),os3)
+  NETSURF_USE_OPENSSL := NO
+  NETSURF_USE_AMISSL := YES
+endif
+
-- 
cgit v1.2.3