aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2019-05-13 22:59:29 -0700
committerPaul Eggert2019-05-13 23:07:05 -0700
commitd2dea70415ca7ec390a2de11b224ab4cbb2c6b55 (patch)
treed9d39ce173af2dc2f51582a5b2097fca412dcfe4
parente0ee41d155b210327eb9c9ad5334f80ed59439f4 (diff)
downloademacs-d2dea70415ca7ec390a2de11b224ab4cbb2c6b55.tar.gz
emacs-d2dea70415ca7ec390a2de11b224ab4cbb2c6b55.zip
Default to disabling ImageMagick (Bug#33587)
ImageMagick has continuing stability and security problems, suggesting that 'configure' should disable it by default. See Glenn Morris's notes at: https://lists.gnu.org/r/emacs-devel/2018-12/msg00036.html * INSTALL, etc/NEWS, nt/INSTALL.W64: Mention this. * configure.ac (imagemagick): Default to off.
-rw-r--r--INSTALL4
-rw-r--r--configure.ac2
-rw-r--r--etc/NEWS4
-rw-r--r--nt/INSTALL.W646
4 files changed, 11 insertions, 5 deletions
diff --git a/INSTALL b/INSTALL
index e38635c60b7..b2a06b3d153 100644
--- a/INSTALL
+++ b/INSTALL
@@ -295,7 +295,9 @@ or more of these options:
295 --without-gif for GIF image support 295 --without-gif for GIF image support
296 --without-png for PNG image support 296 --without-png for PNG image support
297 --without-rsvg for SVG image support 297 --without-rsvg for SVG image support
298 --without-imagemagick for Imagemagick support 298
299Although ImageMagick support is disabled by default due to security
300and stability concerns, you can enable it with --with-imagemagick.
299 301
300Use --without-toolkit-scroll-bars to disable Motif or Xaw3d scroll bars. 302Use --without-toolkit-scroll-bars to disable Motif or Xaw3d scroll bars.
301 303
diff --git a/configure.ac b/configure.ac
index 79fe0c98c6f..d13dddfd9a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -432,7 +432,7 @@ OPTION_DEFAULT_ON([lcms2],[don't compile with Little CMS support])
432OPTION_DEFAULT_ON([libsystemd],[don't compile with libsystemd support]) 432OPTION_DEFAULT_ON([libsystemd],[don't compile with libsystemd support])
433OPTION_DEFAULT_OFF([cairo],[compile with Cairo drawing (experimental)]) 433OPTION_DEFAULT_OFF([cairo],[compile with Cairo drawing (experimental)])
434OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support]) 434OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support])
435OPTION_DEFAULT_ON([imagemagick],[don't compile with ImageMagick image support]) 435OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support])
436OPTION_DEFAULT_ON([json], [don't compile with native JSON support]) 436OPTION_DEFAULT_ON([json], [don't compile with native JSON support])
437 437
438OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts]) 438OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
diff --git a/etc/NEWS b/etc/NEWS
index fa9ca8603de..f7ee9a9dfe4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -37,6 +37,10 @@ functions 'json-serialize', 'json-insert', 'json-parse-string', and
37'json-parse-buffer' are typically much faster than their Lisp 37'json-parse-buffer' are typically much faster than their Lisp
38counterparts from json.el. 38counterparts from json.el.
39 39
40** Emacs no longer defaults to using ImageMagick to display images,
41due to security and stability concerns. To override the default, use
42'configure --with-imagemagick'.
43
40** Several configure options now accept an option-argument 'ifavailable'. 44** Several configure options now accept an option-argument 'ifavailable'.
41For example, './configure --with-xpm=ifavailable' now configures Emacs 45For example, './configure --with-xpm=ifavailable' now configures Emacs
42to attempt to use libxpm but to continue building even if libxpm is 46to attempt to use libxpm but to continue building even if libxpm is
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index 994c567c34b..4583aed83bf 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -139,10 +139,10 @@ which 'make install' will use - in this example we set it to C:\emacs\emacs-26.
139If a prefix is not specified the files will be put in the standard Unix 139If a prefix is not specified the files will be put in the standard Unix
140directories located in your C:\msys64 directory, but this is not recommended. 140directories located in your C:\msys64 directory, but this is not recommended.
141 141
142Note also that we need to disable Imagemagick and D-Bus because Emacs 142Note also that we need to disable D-Bus because Emacs does not yet
143does not yet support them on Windows. 143support them on Windows.
144 144
145 ./configure --prefix=/c/emacs/emacs-26 --without-imagemagick --without-dbus 145 ./configure --prefix=/c/emacs/emacs-26 --without-dbus
146 146
147** Run make 147** Run make
148 148