Merge from trunk

1 files changed, 40 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 66fa0f859aa..0778d0a7b09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2010-09-29  Romain Francoise  <romain@orebokech.com>
+
+        * configure.in: Don't enable ImageMagick unless HAVE_X11.
+
+2010-09-28  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (HAVE_GNUTLS): Add a description to make autoheader
+        happy.
+
+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
+        gnutls libraries.
+
+2010-09-26  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * configure.in: Set up GnuTLS.
+
+2010-09-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * configure.in: Announce whether libxml2 is linked to.
+
+2010-09-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * configure.in (LINKER): Rename to LD_FIRSTFLAG, do not include $(CC).
+
+2010-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * config.bat: Detect that libxml2 is installed and if so, build
+        with it.
+
+2010-09-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * configure.in (HAVE_LIBXML2): Check that the libxml2 we found can
+        be used.  This fixes a conf problem on Mac OS X.
+
 2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * configure.in: Check for libxml2.