Fix shr.el/image build problem

[gnu-emacs] / INSTALL

diff --git a/INSTALL b/INSTALL
index ebd36e74414e9087327e59fb4a3d3f859fb5e012..27af6d9c21f60f9410c0aeb3e4ebc32546336260 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 GNU Emacs Installation Guide
-Copyright (C) 1992, 1994, 1996-1997, 2000-2015 Free Software Foundation,
+Copyright (C) 1992, 1994, 1996-1997, 2000-2016 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
@@ -275,12 +275,13 @@ To disable individual types of image support in Emacs for some reason,
 even though configure finds the libraries, you can configure with one
 or more of these options:
 
-  --without-xpm        for XPM image support
-  --without-jpeg       for JPEG image support
-  --without-tiff       for TIFF image support
-  --without-gif        for GIF image support
-  --without-png        for PNG image support
-  --without-rsvg       for SVG image support
+  --without-xpm          for XPM image support
+  --without-jpeg         for JPEG image support
+  --without-tiff         for TIFF image support
+  --without-gif          for GIF image support
+  --without-png          for PNG image support
+  --without-rsvg         for SVG image support
+  --without-imagemagick  for Imagemagick support
 
 Use --without-toolkit-scroll-bars to disable Motif or Xaw3d scroll bars.
 
@@ -308,13 +309,20 @@ Use --with-wide-int to implement Emacs values with the type 'long long',
 even on hosts where a narrower type would do.  With this option, on a
 typical 32-bit host, Emacs integers have 62 bits instead of 30.
 
+Use --with-cairo to compile Emacs with Cairo drawing.
+
+Use --with-modules to build Emacs with support for loading dynamic
+modules.
+
 Use --enable-gcc-warnings to enable compile-time checks that warn
 about possibly-questionable C code.  This is intended for developers
 and is useful with GNU-compatible compilers.  On a recent GNU system
 there should be no warnings; on older and on non-GNU systems the
-generated warnings may still be useful, though you may prefer building
-with 'make WERROR_CFLAGS=' so that the warnings are not treated as
-errors.
+generated warnings may still be useful, though you may prefer
+configuring with --enable-gcc-warnings=warn-only so they are not
+treated as errors.  The default is --enable-gcc-warnings=warn-only if
+it appears to be a developer build, and is --disable-gcc-warnings
+otherwise.
 
 Use --disable-silent-rules to cause 'make' to give more details about
 the commands it executes.  This can be helpful when debugging a build