[Emacs-diffs] /srv/bzr/emacs/trunk r101653: Compile with imagemagick support by default.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101653
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-27 22:53:35 +0200
message:
  Compile with imagemagick support by default.
modified:
  ChangeLog
  configure
  configure.in
  etc/NEWS

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-09-26 15:18:47 +0000
+++ b/ChangeLog 2010-09-27 20:53:35 +0000
@@ -1,3 +1,7 @@
+2010-09-27  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * configure.in: Enable imagemagick by default.
+
 2010-09-26  Lars Magne Ingebrigtsen  <address@hidden>
 
        * configure.in (HAVE_GNUTLS): Don't break if we don't have the

=== modified file 'configure'
--- a/configure 2010-09-26 15:18:47 +0000
+++ b/configure 2010-09-27 20:53:35 +0000
@@ -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
 
 

=== modified file 'configure.in'
--- a/configure.in      2010-09-26 15:18:47 +0000
+++ b/configure.in      2010-09-27 20:53:35 +0000
@@ -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])

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-09-22 03:10:16 +0000
+++ b/etc/NEWS  2010-09-27 20:53:35 +0000
@@ -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