From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 27 Sep 2010 20:53:35 +0000 (+0200)
Subject: Compile with imagemagick support by default.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ea189f7bfe01e5313e0b95078171718ea5e0d4f;p=emacs.git

Compile with imagemagick support by default.
---

diff --git a/ChangeLog b/ChangeLog
index e9c5ed33998..0d330df0c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/configure b/configure
index a639b708255..8c77569c485 100755
--- a/configure
+++ b/configure
@@ -1521,7 +1521,7 @@ Optional Packages:
   --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 @@ fi
 if test "${with_imagemagick+set}" = set; then :
   withval=$with_imagemagick;
 else
-      with_imagemagick=no
+     with_imagemagick=yes
 fi
 
 
diff --git a/configure.in b/configure.in
index 82d8eced97e..289ef3195d2 100644
--- a/configure.in
+++ b/configure.in
@@ -156,7 +156,7 @@ OPTION_DEFAULT_ON([gif],[don't compile with GIF image support])
 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])
diff --git a/etc/NEWS b/etc/NEWS
index 0647603a3f3..98c04f8428a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -115,8 +115,8 @@ for this.
 
 ** 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