Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[gnu-emacs] / INSTALL

diff --git a/INSTALL b/INSTALL
index ebd36e74414e9087327e59fb4a3d3f859fb5e012..5ca88fecf350c37be28262608ab35e40ae5f158e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -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,6 +309,8 @@ 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 --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