summaryrefslogtreecommitdiff
path: root/Makefile.config
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2009-02-15 11:47:13 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2009-02-15 11:47:13 +0000
commitdd5f00fe79d29c0089e74ed11663cfec6d07641d (patch)
treef07eb7c404bb9972f6ec5dd42fc8945c515da49f /Makefile.config
parentaab2b32e23e82f501e186138391f7cfd9e12afce (diff)
downloadnetsurf-dd5f00fe79d29c0089e74ed11663cfec6d07641d.tar.gz
netsurf-dd5f00fe79d29c0089e74ed11663cfec6d07641d.tar.bz2
Re-enable the ability to control the SSL certificate UI's inclusion. As a side-effect, NetSurf won't build SSL unless the cURL on the system is linked against OpenSSL
svn path=/trunk/netsurf/; revision=6526
Diffstat (limited to 'Makefile.config')
-rw-r--r--Makefile.config8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.config b/Makefile.config
index 2bb64d974..a0b0c62e0 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -41,6 +41,11 @@ NETSURF_USE_MNG := YES
# Valid options: YES, NO
NETSURF_USE_HARU_PDF := YES
+# Enable NetSurf's SSL code. This currently requires openssl and
+# libcurl-openssl to be installed on the system. The autodetection for
+# this involves running curl-config.
+NETSURF_USE_SSL := AUTO
+
# Enable stripping the NetSurf binary
# Valid options: YES, NO
NETSURF_STRIP_BINARY := NO
@@ -92,6 +97,9 @@ ifeq ($(TARGET),riscos)
# Valid options: YES, NO
NETSURF_USE_PLUGINS := NO
+ # Force SSL on, because we can't autodetect it.
+ NETSURF_USE_SSL := AUTO
+
# Optimisation levels
CFLAGS += -O2 -Wuninitialized