summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2009-02-15 12:37:54 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2009-02-15 12:37:54 +0000
commitcb6bba7fb95d61509dbe1949ddd76b10b1d318f8 (patch)
treeaf5c76cfb96c61b4477f9ca0968f948868a936ff
parentdd5f00fe79d29c0089e74ed11663cfec6d07641d (diff)
downloadnetsurf-cb6bba7fb95d61509dbe1949ddd76b10b1d318f8.tar.gz
netsurf-cb6bba7fb95d61509dbe1949ddd76b10b1d318f8.tar.bz2
Fix Amiga SSL build
svn path=/trunk/netsurf/; revision=6528
-rw-r--r--Makefile2
-rw-r--r--Makefile.config3
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 36421cd1c..3ad036d44 100644
--- a/Makefile
+++ b/Makefile
@@ -485,7 +485,7 @@ ifeq ($(TARGET),amiga)
$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG rendering))
CFLAGS += -mcrt=newlib -D__USE_INLINE__ -std=c99 -I . -Dnsamiga
- LDFLAGS += -lxml2 -lcurl -lm -lsocket -lpthread -lregex -lauto -lraauto -lamisslauto -lparserutils -mcrt=newlib
+ LDFLAGS += -lxml2 -lcurl -lm -lsocket -lpthread -lregex -lauto -lraauto -lparserutils -mcrt=newlib
ifeq ($(NETSURF_USE_SSL),YES)
LDFLAGS += -lssl -lcrypto
endif
diff --git a/Makefile.config b/Makefile.config
index a0b0c62e0..46da07e5a 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -175,6 +175,9 @@ ifeq ($(TARGET),amiga)
# Valid options: YES, NO, AUTO (highly recommended)
NETSURF_USE_HUBBUB := YES
+ # Force SSL on, because we can't autodetect it.
+ NETSURF_USE_SSL := YES
+
# Enable NetSurf's use of libsvgtiny for displaying SVGs
# (NB: Requires NETSURF_AMIGA_USE_CAIRO)
# Valid options: YES, NO