Return MNG/PNG lib defaults to how they were originally. Explain in Makefile.config which options actually have a big impact on the user experience for general web browsing.

svn path=/trunk/netsurf/; revision=5367

1 files changed, 15 insertions, 15 deletions

diff --git a/Makefile.config b/Makefile.config
index 62d216365..fd5d455c1 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -4,6 +4,10 @@
 # Some of these options support an 'AUTO' option, as well as YES and NO.
 # When an option is set to AUTO, the Makefile will attempt to detect if that
 # feature is available, enabling it if possible.
+#
+# Options marked "highly recommended" have a severe impact on NetSurf's
+# use as a web browser and should be set to YES unless there is a particularly
+# good reason not to.
 
 # ----------------------------------------------------------------------------
 # Options relating to all versions of NetSurf
@@ -14,22 +18,22 @@
 NETSURF_USE_BMP := YES
 
 # Enable NetSurf's use of libnsgif for displaying GIFs
-# Valid options: YES, NO
+# Valid options: YES, NO				  (highly recommended)
 NETSURF_USE_GIF := YES
 
 # Enable NetSurf's use of libjpeg for displaying JPEGs
-# Valid options: YES, NO
+# Valid options: YES, NO				  (highly recommended)
 NETSURF_USE_JPEG := YES
 
-# Enable NetSurf's use of libmng for displaying MNGs, JNGs and PNGs
-# Valid options: YES, NO
-NETSURF_USE_MNG := NO
-
 # Enable NetSurf's use of libpng for displaying PNGs.  If MNG and PNG
 # are both enabled then NetSurf will choose libpng for PNGs, leaving
 # MNGs and JNGs to libmng.
-# Valid options: YES, NO
-NETSURF_USE_PNG := YES
+# Valid options: YES, NO	  (at least one of PNG/MNG highly recommended)
+NETSURF_USE_PNG := NO
+
+# Enable NetSurf's use of libmng for displaying MNGs, JNGs and PNGs
+# Valid options: YES, NO	  (at least one of PNG/MNG highly recommended)
+NETSURF_USE_MNG := YES
 
 # Enable NetSurf's use of libharu for PDF export and GTK printing support.
 # There is no auto-detection available for this, as it does not have a
@@ -65,7 +69,7 @@ CFLAGS :=
 ifeq ($(TARGET),riscos)
 
   # Enable NetSurf's use of Hubbub to parse HTML, rather than libxml2
-  # Valid options: YES, NO
+  # Valid options: YES, NO				  (highly recommended)
   NETSURF_USE_HUBBUB := YES
 
   # Enable NetSurf's use of libsvgtiny for displaying SVGs
@@ -106,7 +110,7 @@ ifeq ($(TARGET),gtk)
   NETSURF_GTK_BIN := /usr/local/bin/
 
   # Enable NetSurf's use of Hubbub to parse HTML, rather than libxml2
-  # Valid options: YES, NO, AUTO
+  # Valid options: YES, NO, AUTO			  (highly recommended)
   NETSURF_USE_HUBBUB := AUTO
 
   # Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
@@ -159,12 +163,8 @@ ifeq ($(TARGET),amiga)
   # Valid options: YES, NO, AUTO
   NETSURF_USE_ROSPRITE := YES
 
-  # Enable NetSurf's use of libmng for displaying MNGs and PNGs
-  # Valid options: YES, NO
-  NETSURF_USE_MNG := YES
-
   # Enable NetSurf's use of Hubbub to parse HTML rather, than libxml2
-  # Valid options: YES, NO, AUTO
+  # Valid options: YES, NO, AUTO			  (highly recommended)
   NETSURF_USE_HUBBUB := YES
 
   # Optimisation levels