Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/98e02038f3df6e6178ae14efca4b4ad30ba74316
...commit
http://git.netsurf-browser.org/netsurf.git/commit/98e02038f3df6e6178ae14efca4b4ad30ba74316
...tree
http://git.netsurf-browser.org/netsurf.git/tree/98e02038f3df6e6178ae14efca4b4ad30ba74316
The branch, chris/amissl has been updated
via 98e02038f3df6e6178ae14efca4b4ad30ba74316 (commit)
from 13a7004e6b152494eeab677774cdb626b9e1541d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=98e02038f3df6e6178ae14efca4b4ad30ba74316
commit 98e02038f3df6e6178ae14efca4b4ad30ba74316
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Allow for building against AmiSSL instead of OpenSSL
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index ac05d1b..8b1345a 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,-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
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index f19d6e3..17e097d 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -6,6 +6,11 @@
# 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.
+# 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 +35,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
+
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/Makefile | 3 ++-
frontends/amiga/Makefile.defaults | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index ac05d1b..8b1345a 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,-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
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index f19d6e3..17e097d 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -6,6 +6,11 @@
# 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.
+# 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 +35,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
+
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
