From a011abf55f0d61e4425b5fb783bd007f27c9f778 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 1 Aug 2008 11:29:18 +0000
Subject: Move plugin option to Makefile.config. Disable it by default.

svn path=/trunk/netsurf/; revision=4853
---
 Makefile        | 1 +
 Makefile.config | 4 ++++
 utils/config.h  | 2 --
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6bd956e58..f92262902 100644
--- a/Makefile
+++ b/Makefile
@@ -231,6 +231,7 @@ ifeq ($(TARGET),riscos)
   $(eval $(call feature_enabled,DRAW,-DWITH_DRAW,-lpencil,Drawfile export))
   $(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,,RISC OS sprite rendering))
   $(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering))
+  $(eval $(call feature_enabled,PLUGINS,-DWITH_PLUGIN,,Plugin protocol support))
 endif
 
 # ----------------------------------------------------------------------------
diff --git a/Makefile.config b/Makefile.config
index a307ff9d0..0d8c8778d 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -68,6 +68,10 @@ ifeq ($(TARGET),riscos)
   # Valid options: YES, NO
   NETSURF_USE_ARTWORKS := YES
 
+  # Enable support for the Acorn plugin protocol
+  # Valid options: YES, NO
+  NETSURF_USE_PLUGINS := NO
+
 endif
 
 # ----------------------------------------------------------------------------
diff --git a/utils/config.h b/utils/config.h
index d5aca43e7..2e586974c 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -48,8 +48,6 @@ char *strndup(const char *s, size_t n);
 
 /* Platform specific features */
 #if defined(riscos)
-    /* Plugin module */
-    #define WITH_PLUGIN
     /* Acorn URI protocol support */
     #define WITH_URI
     /* ANT URL protocol support */
-- 
cgit v1.2.3