Mercurial > emacs
changeset 110614:ced897c0b9f0
Compile with imagemagick support by default.
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> |
|---|---|
| date | Mon, 27 Sep 2010 22:53:35 +0200 |
| parents | ddf04bc5ad27 |
| children | 84a76c5e1b1c |
| files | ChangeLog configure configure.in etc/NEWS |
| diffstat | 4 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 27 22:43:03 2010 +0200 +++ b/ChangeLog Mon Sep 27 22:53:35 2010 +0200 @@ -1,3 +1,7 @@ +2010-09-27 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * configure.in: Enable imagemagick by default. + 2010-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org> * configure.in (HAVE_GNUTLS): Don't break if we don't have the
--- a/configure Mon Sep 27 22:43:03 2010 +0200 +++ b/configure Mon Sep 27 22:53:35 2010 +0200 @@ -1521,7 +1521,7 @@ --without-png don't compile with PNG image support --without-rsvg don't compile with SVG image support --without-xml2 don't compile with XML parsing support - --with-imagemagick compile with ImageMagick image support + --without-imagemagick don't compile with ImageMagick image support --without-xft don't use XFT for anti aliased fonts --without-libotf don't use libotf for OpenType font support --without-m17n-flt don't use m17n-flt for text shaping @@ -2752,7 +2752,7 @@ if test "${with_imagemagick+set}" = set; then : withval=$with_imagemagick; else - with_imagemagick=no + with_imagemagick=yes fi
--- a/configure.in Mon Sep 27 22:43:03 2010 +0200 +++ b/configure.in Mon Sep 27 22:53:35 2010 +0200 @@ -156,7 +156,7 @@ OPTION_DEFAULT_ON([png],[don't compile with PNG image support]) OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support]) OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support]) -OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support]) +OPTION_DEFAULT_ON([imagemagick],[don't compile with ImageMagick image support]) OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts]) OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support])
--- a/etc/NEWS Mon Sep 27 22:43:03 2010 +0200 +++ b/etc/NEWS Mon Sep 27 22:53:35 2010 +0200 @@ -115,8 +115,8 @@ ** ImageMagick support. It is now possible to use the Imagemagick library to load many new -image formats in Emacs. To enable this, use the configure option -`--with-imagemagick'. +image formats in Emacs. It is enable by default. To disable this, use +the configure option `--without-imagemagick'. The new function `imagemagick-types' returns a list of image file extensions that your installation of ImageMagick supports. The